Bug 1698332 - fix clear button in input type=search on android, r=emilio

Differential Revision: https://phabricator.services.mozilla.com/D122541

layout/reftests/forms/input/search/reftest.list

@@ -2,4 +2,4 @@
 == 2.html ref.html
 != 3.html ref.html
 pref(layout.forms.input-type-search.enabled,true) == search-basic.html ref.html
-pref(layout.forms.input-type-search.enabled,true) fails-if(Android) != search-with-value.html text-with-value.html # Bug 1698332
+pref(layout.forms.input-type-search.enabled,true) != search-with-value.html text-with-value.html

layout/style/jar.mn

@@ -28,6 +28,7 @@ toolkit.jar:
    res/accessiblecaret-tilt-right@1.5x.png   (res/accessiblecaret-tilt-right@1.5x.png)
    res/accessiblecaret-tilt-right@2x.png     (res/accessiblecaret-tilt-right@2x.png)
    res/accessiblecaret-tilt-right@2.25x.png  (res/accessiblecaret-tilt-right@2.25x.png)
+   res/searchfield-cancel.svg                (res/searchfield-cancel.svg)
 
 % resource gre-resources %res/
 % resource content-accessible resource://gre/contentaccessible/ contentaccessible=yes

layout/style/res/forms.css

@@ -979,7 +979,7 @@ input[type=search]::-moz-search-clear-button {
   max-width: 100%;
   margin-inline-start: 1px;
   align-self: center;
-  background-image: url(chrome://global/skin/icons/searchfield-cancel.svg);
+  background-image: url("resource://gre-resources/searchfield-cancel.svg");
   background-repeat: no-repeat;
   background-position: center;
   background-size: contain;

toolkit/themes/linux/global/search-textbox.css

@@ -58,7 +58,7 @@ html|input {
 }
 
 .textbox-search-clear {
-  list-style-image: url(chrome://global/skin/icons/searchfield-cancel.svg);
+  list-style-image: url(resource://gre-resources/searchfield-cancel.svg);
 }
 
 :host([searchbutton]) .textbox-search-icon:not([disabled]),

toolkit/themes/osx/global/search-textbox.css

@@ -43,7 +43,7 @@ html|input {
 /* ::::: icons ::::: */
 
 .textbox-search-clear {
-  list-style-image: url(chrome://global/skin/icons/searchfield-cancel.svg);
+  list-style-image: url(resource://gre-resources/searchfield-cancel.svg);
   margin-bottom: 1px;
 }
 

toolkit/themes/shared/jar.inc.mn

@@ -40,7 +40,6 @@ toolkit.jar:
   skin/classic/global/icons/check-partial.svg              (../../shared/icons/check-partial.svg)
   skin/classic/global/icons/chevron.svg                    (../../shared/icons/chevron.svg)
   skin/classic/global/icons/close.svg                      (../../shared/icons/close.svg)
-  skin/classic/global/icons/searchfield-cancel.svg         (../../shared/icons/searchfield-cancel.svg)
   skin/classic/global/icons/columnpicker.svg               (../../shared/icons/columnpicker.svg)
   skin/classic/global/icons/delete.svg                     (../../shared/icons/delete.svg)
   skin/classic/global/icons/defaultFavicon.svg             (../../shared/icons/defaultFavicon.svg)

toolkit/themes/windows/global/search-textbox.css

@@ -67,7 +67,7 @@ html|input {
 }
 
 .textbox-search-clear {
-  list-style-image: url(chrome://global/skin/icons/searchfield-cancel.svg);
+  list-style-image: url(resource://gre-resources/searchfield-cancel.svg);
 }
 
 .textbox-search-clear:not([disabled]) {