From f29b4d1116642ae12a5e8c3418df462b1e4e0bd5 Mon Sep 17 00:00:00 2001
From: Jonas Jenwald <jonas.jenwald@gmail.com>
Date: Sat, 22 Sep 2018 15:31:33 +0200
Subject: [PATCH] Clear all find highlights when the findbar is closed (issue
 7468)

Please note that this will require a `mozilla-central` follow-up patch, in order for this to work in the built-in Firefox PDF viewer as well.
---
 web/firefoxcom.js          | 21 ++++++++++++++-------
 web/pdf_find_bar.js        |  3 ++-
 web/pdf_find_controller.js | 17 +++++++++++++++--
 web/text_layer_builder.js  |  9 ++++++++-
 4 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/web/firefoxcom.js b/web/firefoxcom.js
index 4ac860f3f..27cf9d4ff 100644
--- a/web/firefoxcom.js
+++ b/web/firefoxcom.js
@@ -169,20 +169,27 @@ class MozL10n {
     'findhighlightallchange',
     'findcasesensitivitychange',
     'findentirewordchange',
+    'findbarclose',
   ];
-  let handleEvent = function(evt) {
+  let handleEvent = function({ type, detail, }) {
     if (!PDFViewerApplication.initialized) {
       return;
     }
+    if (type === 'findbarclose') {
+      PDFViewerApplication.eventBus.dispatch('findbarclose', {
+        source: window,
+      });
+      return;
+    }
     PDFViewerApplication.eventBus.dispatch('find', {
       source: window,
-      type: evt.type.substring('find'.length),
-      query: evt.detail.query,
+      type: type.substring('find'.length),
+      query: detail.query,
       phraseSearch: true,
-      caseSensitive: !!evt.detail.caseSensitive,
-      entireWord: !!evt.detail.entireWord,
-      highlightAll: !!evt.detail.highlightAll,
-      findPrevious: !!evt.detail.findPrevious,
+      caseSensitive: !!detail.caseSensitive,
+      entireWord: !!detail.entireWord,
+      highlightAll: !!detail.highlightAll,
+      findPrevious: !!detail.findPrevious,
     });
   };
 
diff --git a/web/pdf_find_bar.js b/web/pdf_find_bar.js
index 310acd2bb..61362099f 100644
--- a/web/pdf_find_bar.js
+++ b/web/pdf_find_bar.js
@@ -216,7 +216,8 @@ class PDFFindBar {
     this.opened = false;
     this.toggleButton.classList.remove('toggled');
     this.bar.classList.add('hidden');
-    this.findController.active = false;
+
+    this.eventBus.dispatch('findbarclose', { source: this, });
   }
 
   toggle() {
diff --git a/web/pdf_find_controller.js b/web/pdf_find_controller.js
index fd3d9d17d..71457d9df 100644
--- a/web/pdf_find_controller.js
+++ b/web/pdf_find_controller.js
@@ -53,11 +53,24 @@ class PDFFindController {
 
     this.reset();
 
+    eventBus.on('findbarclose', () => {
+      this._highlightMatches = false;
+
+      eventBus.dispatch('updatetextlayermatches', {
+        source: this,
+        pageIndex: -1,
+      });
+    });
+
     // Compile the regular expression for text normalization once.
     const replace = Object.keys(CHARACTERS_TO_NORMALIZE).join('');
     this._normalizationRegex = new RegExp(`[${replace}]`, 'g');
   }
 
+  get highlightMatches() {
+    return this._highlightMatches;
+  }
+
   get pageMatches() {
     return this._pageMatches;
   }
@@ -75,7 +88,7 @@ class PDFFindController {
   }
 
   reset() {
-    this.active = false; // If active, find results will be highlighted.
+    this._highlightMatches = false;
     this._pageMatches = [];
     this._pageMatchesLength = null;
     this._state = null;
@@ -353,7 +366,7 @@ class PDFFindController {
     const currentPageIndex = this._pdfViewer.currentPageNumber - 1;
     const numPages = this._pdfViewer.pagesCount;
 
-    this.active = true;
+    this._highlightMatches = true;
 
     if (this._dirtyMatch) {
       // Need to recalculate the matches, reset everything.
diff --git a/web/text_layer_builder.js b/web/text_layer_builder.js
index d8194b295..281f22a88 100644
--- a/web/text_layer_builder.js
+++ b/web/text_layer_builder.js
@@ -317,7 +317,7 @@ class TextLayerBuilder {
       clearedUntilDivIdx = match.end.divIdx + 1;
     }
 
-    if (this.findController === null || !this.findController.active) {
+    if (!this.findController || !this.findController.highlightMatches) {
       return;
     }
 
@@ -357,8 +357,15 @@ class TextLayerBuilder {
         delete _boundEvents[name];
       }
     };
+    _boundEvents.updateTextLayerMatches = (evt) => {
+      if (evt.pageIndex !== -1) {
+        return;
+      }
+      this.updateMatches();
+    };
 
     eventBus.on('pagecancelled', _boundEvents.pageCancelled);
+    eventBus.on('updatetextlayermatches', _boundEvents.updateTextLayerMatches);
   }
 
   /**