From cb0009dab43e0f8aaf630fb826159936047a361e Mon Sep 17 00:00:00 2001
From: Jonas Jenwald <jonas.jenwald@gmail.com>
Date: Wed, 5 Jul 2017 11:19:29 +0200
Subject: [PATCH 1/2] Actually reset the `findResultsCount` label, in addition
 to hiding it, when no matches are found

Currently we're *only* hiding the label, but not actually resetting it until a new match is found.
Obviously it's being hidden, but it seems that it really ought to be completely reset as well (since e.g. `PDFFindBar.reset` won't technically reset *all* state otherwise).
---
 web/pdf_find_bar.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/web/pdf_find_bar.js b/web/pdf_find_bar.js
index c1d7132c5..c26546647 100644
--- a/web/pdf_find_bar.js
+++ b/web/pdf_find_bar.js
@@ -151,15 +151,15 @@ class PDFFindBar {
       return; // No UI control is provided.
     }
 
-    // If there are no matches, hide the counter.
     if (!matchCount) {
+      // If there are no matches, hide and reset the counter.
       this.findResultsCount.classList.add('hidden');
-      return;
+      this.findResultsCount.textContent = '';
+    } else {
+      // Update and show the match counter.
+      this.findResultsCount.textContent = matchCount.toLocaleString();
+      this.findResultsCount.classList.remove('hidden');
     }
-
-    // Create and show the match counter.
-    this.findResultsCount.textContent = matchCount.toLocaleString();
-    this.findResultsCount.classList.remove('hidden');
   }
 
   open() {

From 9c95614bb679fe8cfd0dc5e105fd92824118fb59 Mon Sep 17 00:00:00 2001
From: Jonas Jenwald <jonas.jenwald@gmail.com>
Date: Wed, 5 Jul 2017 11:34:14 +0200
Subject: [PATCH 2/2] Ensure that `PDFFindBar._adjustWidth` is called in all
 situations where the width of the findbar might have changed

After PR 8394, where the l10n service was converted to be asynchronous, we're no longer calling `_adjustWidth` after updating the `findMsg` label. Hence it's currently possible that the width of the findbar won't be correct. The solution is simple though, just call `_adjustWidth` after the `findMsg` label has been (asynchronously) updated.

Another existing issue, which was an oversight in PR 8132, is that `PDFFindBar.updateResultsCount` may be called directly from `PDFFindController`. In that case, we're not calling `_adjustWidth` at all, which means that the findbar may also not have the correct width.
The simple solution here is to always call `_adjustWidth` at the end of `updateResultsCount` (which is why we no longer need the `_adjustWidth` call at the end of `updateUIState`).
---
 web/pdf_find_bar.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/web/pdf_find_bar.js b/web/pdf_find_bar.js
index c26546647..cefd50017 100644
--- a/web/pdf_find_bar.js
+++ b/web/pdf_find_bar.js
@@ -140,10 +140,10 @@ class PDFFindBar {
     this.findField.setAttribute('data-status', status);
     Promise.resolve(findMsg).then((msg) => {
       this.findMsg.textContent = msg;
+      this._adjustWidth();
     });
 
     this.updateResultsCount(matchCount);
-    this._adjustWidth();
   }
 
   updateResultsCount(matchCount) {
@@ -160,6 +160,9 @@ class PDFFindBar {
       this.findResultsCount.textContent = matchCount.toLocaleString();
       this.findResultsCount.classList.remove('hidden');
     }
+    // Since `updateResultsCount` may be called from `PDFFindController`,
+    // ensure that the width of the findbar is always updated correctly.
+    this._adjustWidth();
   }
 
   open() {