From af3d4809763ef308f08ced947a73b624729ac7ea Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Date: Tue, 13 Oct 2015 13:24:50 +0200
Subject: BASELINE: Update Chromium to 47.0.2526.14
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also adding in sources needed for spellchecking.

Change-Id: Idd44170fa1616f26315188970a8d5ba7d472b18a
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
---
 .../elements/viewer-pdf-toolbar/viewer-pdf-toolbar.js  | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'chromium/chrome/browser/resources/pdf/elements/viewer-pdf-toolbar/viewer-pdf-toolbar.js')

diff --git a/chromium/chrome/browser/resources/pdf/elements/viewer-pdf-toolbar/viewer-pdf-toolbar.js b/chromium/chrome/browser/resources/pdf/elements/viewer-pdf-toolbar/viewer-pdf-toolbar.js
index 62e5cf9a5ec..338d9eaaeb0 100644
--- a/chromium/chrome/browser/resources/pdf/elements/viewer-pdf-toolbar/viewer-pdf-toolbar.js
+++ b/chromium/chrome/browser/resources/pdf/elements/viewer-pdf-toolbar/viewer-pdf-toolbar.js
@@ -10,6 +10,7 @@
     ],
 
     properties: {
+      strings: Object,
       /**
        * The current loading progress of the PDF document (0 - 100).
        */
@@ -78,15 +79,14 @@
     },
 
     _onAnimationFinished: function() {
-      if (!this.opened)
-        this.style.visibility = 'hidden';
+        this.style.transform = this.opened ? 'none' : 'translateY(-100%)';
     },
 
     loadProgressChanged: function() {
       if (this.loadProgress >= 100) {
-        this.$.title.classList.toggle('invisible', false);
         this.$.pageselector.classList.toggle('invisible', false);
         this.$.buttons.classList.toggle('invisible', false);
+        this.$.progress.style.opacity = 0;
       }
     },
 
@@ -98,7 +98,6 @@
     show: function() {
       if (!this.opened) {
         this.toggleVisibility();
-        this.style.visibility = 'initial';
       }
     },
 
@@ -113,7 +112,16 @@
     },
 
     shouldKeepOpen: function() {
-      return this.$.bookmarks.dropdownOpen || this.loadProgress < 100;
+      return this.$.bookmarks.dropdownOpen || this.loadProgress < 100 ||
+          this.$.pageselector.isActive();
+    },
+
+    hideDropdowns: function() {
+      if (this.$.bookmarks.dropdownOpen) {
+        this.$.bookmarks.toggleDropdown();
+        return true;
+      }
+      return false;
     },
 
     setDropdownLowerBound: function(lowerBound) {
-- 
cgit v1.2.3