From 95d6b1b58ee953264eaa2ee2065aa7aee2a6774f Mon Sep 17 00:00:00 2001
From: "Lucius Q. User" <snprintfv@gmail.com>
Date: Thu, 16 Nov 2017 11:06:58 +0300
Subject: [PATCH] Bug 1414020 - Remove the "searchbar-treebody" binding and
 instead migrate the behavior to an attribute on "autocomplete-treebody".
 r=adw

---
 browser/components/search/content/search.xml    | 15 +--------------
 .../search/content/searchbarBindings.css        |  4 ----
 toolkit/content/widgets/autocomplete.xml        | 17 +++++++++++++++--
 3 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/browser/components/search/content/search.xml b/browser/components/search/content/search.xml
index ee7388a9d3f5..94bab3b8a692 100644
--- a/browser/components/search/content/search.xml
+++ b/browser/components/search/content/search.xml
@@ -945,7 +945,7 @@
         <xul:treecols anonid="treecols">
           <xul:treecol id="treecolAutoCompleteValue" class="autocomplete-treecol" flex="1" overflow="true"/>
         </xul:treecols>
-        <xul:treechildren class="autocomplete-treebody searchbar-treebody"/>
+        <xul:treechildren class="autocomplete-treebody searchbar-treebody" noSelectOnMouseMove="true"/>
       </xul:tree>
       <xul:vbox anonid="search-one-off-buttons" class="search-one-offs"/>
     </content>
@@ -1153,19 +1153,6 @@
 
   </binding>
 
-
-  <!-- This is the same as the autocomplete-treebody binding except it does not
-       select rows on mousemove. -->
-  <binding id="searchbar-treebody"
-           extends="chrome://global/content/bindings/autocomplete.xml#autocomplete-treebody">
-    <handlers>
-      <handler event="mousemove"><![CDATA[
-        // Cancel the event so that the base binding doesn't select the row.
-        event.preventDefault();
-      ]]></handler>
-    </handlers>
-  </binding>
-
   <!-- Used for additional open search providers in the search panel. -->
   <binding id="addengine-icon" extends="xul:box">
     <content>
diff --git a/browser/components/search/content/searchbarBindings.css b/browser/components/search/content/searchbarBindings.css
index 18341b06ffab..0429e88119c0 100644
--- a/browser/components/search/content/searchbarBindings.css
+++ b/browser/components/search/content/searchbarBindings.css
@@ -8,10 +8,6 @@
   -moz-binding: url("chrome://browser/content/search/search.xml#searchbar-textbox");
 }
 
-.searchbar-treebody {
-  -moz-binding: url("chrome://browser/content/search/search.xml#searchbar-treebody");
-}
-
 .search-one-offs {
   -moz-binding: url("chrome://browser/content/search/search.xml#search-one-offs");
 }
diff --git a/toolkit/content/widgets/autocomplete.xml b/toolkit/content/widgets/autocomplete.xml
index b801d18ba229..a0b9989e4e09 100644
--- a/toolkit/content/widgets/autocomplete.xml
+++ b/toolkit/content/widgets/autocomplete.xml
@@ -2506,6 +2506,19 @@ extends="chrome://global/content/bindings/popup.xml#popup">
   <binding id="autocomplete-treebody">
     <implementation>
       <field name="mLastMoveTime">Date.now()</field>
+      <property name="noSelectOnMouseMove">
+        <getter><![CDATA[
+          return this.getAttribute("noSelectOnMouseMove") == "true";
+        ]]></getter>
+        <setter><![CDATA[
+          if (val) {
+            this.setAttribute("noSelectOnMouseMove", "true");
+          } else {
+            this.removeAttribute("noSelectOnMouseMove");
+          }
+          return !!val;
+        ]]></setter>
+      </property>
     </implementation>
 
     <handlers>
@@ -2518,8 +2531,8 @@ extends="chrome://global/content/bindings/popup.xml#popup">
       ]]></handler>
 
       <handler event="mousemove"><![CDATA[
-        if (event.defaultPrevented) {
-          // Allow bindings that extend this one to cancel the event so that
+        if (this.noSelectOnMouseMove) {
+          // Allow uses of this binding to cancel the event so that
           // nothing is selected.
           return;
         }