merge mozilla-inbound to mozilla-central. r=merge a=merge

MozReview-Commit-ID: Lbq8F50U0Nf

browser/components/search/content/search.xml

@@ -51,11 +51,12 @@
         children differently)
         -->
         <xul:box>
-          <xul:hbox class="searchbar-search-button-container">
-            <xul:image class="searchbar-search-button"
-                       anonid="searchbar-search-button"
-                       xbl:inherits="addengines"
-                       tooltiptext="&searchIcon.tooltip;"/>
+          <xul:hbox class="searchbar-search-button"
+                    anonid="searchbar-search-button"
+                    xbl:inherits="addengines"
+                    tooltiptext="&searchIcon.tooltip;">
+            <xul:image class="searchbar-search-icon"/>
+            <xul:image class="searchbar-search-icon-overlay"/>
           </xul:hbox>
         </xul:box>
         <xul:hbox class="search-go-container">

browser/themes/linux/searchbar.css

@@ -13,10 +13,6 @@
   margin-inline-start: -1px;
 }
 
-.search-go-container {
-  -moz-box-align: center;
-}
-
 menuitem[cmd="cmd_clearhistory"] {
   list-style-image: url("moz-icon://stock/gtk-clear?size=menu");
 }
@@ -25,50 +21,6 @@ menuitem[cmd="cmd_clearhistory"][disabled] {
   list-style-image: url("moz-icon://stock/gtk-clear?size=menu&state=disabled");
 }
 
-.searchbar-search-button-container {
-  -moz-box-align: center;
-}
-
-.searchbar-search-button {
-  list-style-image: url("chrome://browser/skin/search-indicator.png");
-  -moz-image-region: rect(0, 20px, 20px, 0);
-  margin-top: 1px;
-  margin-bottom: 1px;
-  margin-inline-start: 2px;
-  width: 20px;
-}
-
-.searchbar-search-button[addengines="true"] {
-  list-style-image: url("chrome://browser/skin/search-indicator-badge-add.png");
-}
-
-.searchbar-search-button:hover {
-  -moz-image-region: rect(0, 40px, 20px, 20px);
-}
-
-.searchbar-search-button:hover:active {
-  -moz-image-region: rect(0, 60px, 20px, 40px);
-}
-
-@media (min-resolution: 1.1dppx) {
-  .searchbar-search-button {
-    list-style-image: url("chrome://browser/skin/[email protected]");
-    -moz-image-region: rect(0, 40px, 40px, 0);
-  }
-
-  .searchbar-search-button[addengines="true"] {
-    list-style-image: url("chrome://browser/skin/[email protected]");
-  }
-
-  .searchbar-search-button:hover {
-    -moz-image-region: rect(0, 80px, 40px, 40px);
-  }
-
-  .searchbar-search-button:hover:active {
-    -moz-image-region: rect(0, 120px, 40px, 80px);
-  }
-}
-
 .search-panel-current-engine {
   -moz-box-align: center;
 }

browser/themes/osx/searchbar.css

@@ -17,50 +17,6 @@
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.svg");
 }
 
-.search-go-container,
-.searchbar-search-button-container {
-  -moz-box-align: center;
-}
-
-.searchbar-search-button {
-  list-style-image: url("chrome://browser/skin/search-indicator.png");
-  -moz-image-region: rect(0, 20px, 20px, 0);
-  margin-inline-start: 3px;
-  margin-inline-end: 1px;
-}
-
-.searchbar-search-button[addengines="true"] {
-  list-style-image: url("chrome://browser/skin/search-indicator-badge-add.png");
-}
-
-.searchbar-search-button:hover {
-  -moz-image-region: rect(0, 40px, 20px, 20px);
-}
-
-.searchbar-search-button:hover:active {
-  -moz-image-region: rect(0, 60px, 20px, 40px);
-}
-
-@media (min-resolution: 2dppx) {
-  .searchbar-search-button {
-    list-style-image: url("chrome://browser/skin/[email protected]");
-    width: 20px;
-    -moz-image-region: rect(0, 40px, 40px, 0);
-  }
-
-  .searchbar-search-button[addengines="true"] {
-    list-style-image: url("chrome://browser/skin/[email protected]");
-  }
-
-  .searchbar-search-button:hover {
-    -moz-image-region: rect(0, 80px, 40px, 40px);
-  }
-
-  .searchbar-search-button:hover:active {
-    -moz-image-region: rect(0, 120px, 40px, 80px);
-  }
-}
-
 .search-panel-current-engine {
   border-radius: 4px 4px 0 0;
 }

browser/themes/shared/jar.inc.mn

@@ -55,6 +55,7 @@
   skin/classic/browser/identity-icon.svg                       (../shared/identity-block/identity-icon.svg)
   skin/classic/browser/identity-icon-notice.svg                (../shared/identity-block/identity-icon-notice.svg)
   skin/classic/browser/info.svg                                (../shared/info.svg)
+  skin/classic/browser/searchReset.css                         (../shared/searchReset.css)
 
   skin/classic/browser/illustrations/error-session-restore.svg (../shared/illustrations/error-session-restore.svg)
 
@@ -180,17 +181,14 @@
   skin/classic/browser/zoom-out.svg                   (../shared/icons/zoom-out.svg)
 
 
-  skin/classic/browser/search-indicator.png                    (../shared/search/search-indicator.png)
-  skin/classic/browser/[email protected]                 (../shared/search/[email protected])
-  skin/classic/browser/search-engine-placeholder.png           (../shared/search/search-engine-placeholder.png)
-  skin/classic/browser/[email protected]        (../shared/search/[email protected])
-  skin/classic/browser/searchReset.css                         (../shared/searchReset.css)
   skin/classic/browser/badge-add-engine.png                    (../shared/search/badge-add-engine.png)
   skin/classic/browser/[email protected]                 (../shared/search/[email protected])
-  skin/classic/browser/search-indicator-badge-add.png          (../shared/search/search-indicator-badge-add.png)
-  skin/classic/browser/[email protected]       (../shared/search/[email protected])
-  skin/classic/browser/search-indicator-magnifying-glass.svg   (../shared/search/search-indicator-magnifying-glass.svg)
   skin/classic/browser/search-arrow-go.svg                     (../shared/search/search-arrow-go.svg)
+  skin/classic/browser/search-engine-placeholder.png           (../shared/search/search-engine-placeholder.png)
+  skin/classic/browser/[email protected]        (../shared/search/[email protected])
+  skin/classic/browser/search-indicator-badge-add.svg          (../shared/search/search-indicator-badge-add.svg)
+  skin/classic/browser/search-indicator-magnifying-glass.svg   (../shared/search/search-indicator-magnifying-glass.svg)
+
   skin/classic/browser/tabbrowser/loading.svg                  (../shared/tabbrowser/loading.svg)
   skin/classic/browser/tabbrowser/loading-burst.svg            (../shared/tabbrowser/loading-burst.svg)
   skin/classic/browser/tabbrowser/crashed.svg                  (../shared/tabbrowser/crashed.svg)
@@ -202,6 +200,7 @@
   skin/classic/browser/tabbrowser/tab-audio-blocked.svg        (../shared/tabbrowser/tab-audio-blocked.svg)
   skin/classic/browser/tabbrowser/tab-audio-small.svg          (../shared/tabbrowser/tab-audio-small.svg)
   skin/classic/browser/tabbrowser/tab-overflow-indicator.png   (../shared/tabbrowser/tab-overflow-indicator.png)
+
   skin/classic/browser/toolbarbutton-dropdown-arrow.png        (../shared/toolbarbutton-dropdown-arrow.png)
   skin/classic/browser/translating-16.png                      (../shared/translation/translating-16.png)
   skin/classic/browser/[email protected]                   (../shared/translation/[email protected])

browser/themes/shared/urlbar-searchbar.inc.css

@@ -364,3 +364,49 @@
 #urlbar-zoom-button > .toolbarbutton-icon {
   display: none;
 }
+
+/* Search bar */
+
+.searchbar-search-button {
+  -moz-box-align: center;
+  fill: currentColor;
+}
+
+.searchbar-search-icon {
+  list-style-image: url(chrome://browser/skin/search-glass.svg);
+  -moz-context-properties: fill, fill-opacity;
+  pointer-events: none;
+  margin-inline-start: 8px;
+  margin-inline-end: 6px;
+  fill-opacity: .4;
+}
+
+.searchbar-search-button:hover > .searchbar-search-icon {
+  fill-opacity: .6;
+}
+
+.searchbar-search-button:hover:active > .searchbar-search-icon {
+  fill-opacity: .8;
+}
+
+.searchbar-search-icon-overlay {
+  pointer-events: none;
+}
+
+.searchbar-search-button[addengines=true] > .searchbar-search-icon-overlay {
+  list-style-image: url(chrome://browser/skin/search-indicator-badge-add.svg);
+  margin-inline-start: -15px;
+  margin-inline-end: 4px;
+  margin-top: -10px;
+  width: 11px;
+  height: 11px;
+}
+
+.searchbar-search-button:hover:not([addengines=true]) > .searchbar-search-icon-overlay {
+  list-style-image: url(chrome://global/skin/icons/arrow-dropdown-12.svg);
+  -moz-context-properties: fill;
+  margin-inline-start: -8px;
+  margin-inline-end: 2px;
+  width: 6px;
+  height: 6px;
+}

browser/themes/windows/searchbar.css

@@ -13,51 +13,6 @@
   margin-inline-start: -1px;
 }
 
-.search-go-container,
-.searchbar-search-button-container {
-  -moz-box-align: center;
-}
-
-.searchbar-search-button {
-  list-style-image: url("chrome://browser/skin/search-indicator.png");
-  -moz-image-region: rect(0, 20px, 20px, 0);
-  margin-top: 1px;
-  margin-bottom: 1px;
-  margin-inline-start: 4px;
-  width: 20px;
-}
-
-.searchbar-search-button[addengines="true"] {
-  list-style-image: url("chrome://browser/skin/search-indicator-badge-add.png");
-}
-
-.searchbar-search-button:hover {
-  -moz-image-region: rect(0, 40px, 20px, 20px);
-}
-
-.searchbar-search-button:hover:active {
-  -moz-image-region: rect(0, 60px, 20px, 40px);
-}
-
-@media (min-resolution: 1.1dppx) {
-  .searchbar-search-button {
-    list-style-image: url("chrome://browser/skin/[email protected]");
-    -moz-image-region: rect(0, 40px, 40px, 0);
-  }
-
-  .searchbar-search-button[addengines="true"] {
-    list-style-image: url("chrome://browser/skin/[email protected]");
-  }
-
-  .searchbar-search-button:hover {
-    -moz-image-region: rect(0, 80px, 40px, 40px);
-  }
-
-  .searchbar-search-button:hover:active {
-    -moz-image-region: rect(0, 120px, 40px, 80px);
-  }
-}
-
 .search-panel-current-engine {
   -moz-box-align: center;
 }