Backed out changeset c8057f34f281 (bug 1550559) as requested. CLOSED TREE

toolkit/content/widgets/findbar.js

@@ -29,7 +29,7 @@ class MozFindbar extends XULElement {
     this.content = MozXULElement.parseXULToFragment(`
       <hbox anonid="findbar-container" class="findbar-container" flex="1" align="center">
         <hbox anonid="findbar-textbox-wrapper" align="stretch">
-          <html:input anonid="findbar-textbox" class="findbar-textbox findbar-find-fast" />
+          <textbox anonid="findbar-textbox" class="findbar-textbox findbar-find-fast" />
           <toolbarbutton anonid="find-previous" class="findbar-find-previous tabbable" data-l10n-attrs="tooltiptext" data-l10n-id="findbar-previous" oncommand="onFindAgainCommand(true);" disabled="true" />
           <toolbarbutton anonid="find-next" class="findbar-find-next tabbable" data-l10n-id="findbar-next" oncommand="onFindAgainCommand(false);" disabled="true" />
         </hbox>

toolkit/themes/osx/global/findBar.css

@@ -65,13 +65,13 @@ label.findbar-find-fast:-moz-lwtheme {
 }
 
 @media (-moz-mac-yosemite-theme: 0) {
-  html|input.findbar-textbox,
+  .findbar-textbox,
   .findbar-find-next {
     border-radius: 10000px;
   }
 }
 
-html|input.findbar-textbox {
+.findbar-textbox {
   border: @roundButtonBorderWidth@ @roundButtonBorderStyle@ var(--lwt-toolbar-field-border-color, @roundButtonBorderColor@);
   -moz-context-properties: fill, fill-opacity;
   fill: currentColor;
@@ -83,11 +83,11 @@ html|input.findbar-textbox {
   padding-inline-start: 19px;
 }
 
-html|input.findbar-textbox:focus {
+.findbar-textbox[focused="true"] {
   box-shadow: 0 0 0 1px var(--toolbar-field-focus-border-color) inset,
               0 0 0 1px var(--toolbar-field-focus-border-color);
 }
 
-html|input.findbar-textbox:-moz-locale-dir(rtl) {
+.findbar-textbox:-moz-locale-dir(rtl) {
   background-position-x: right 5px;
 }

toolkit/themes/shared/findBar.inc.css

@@ -3,7 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-@namespace html url("http://www.w3.org/1999/xhtml");
 
 findbar {
   border-top: 1px solid ThreeDShadow;
@@ -49,7 +48,7 @@ contrast issues, see bug 1506913 */
   --lwt-toolbar-field-focus-color: initial;
 }
 
-html|input.findbar-textbox {
+.findbar-textbox {
   -moz-appearance: none;
   background-color: -moz-Field;
   border: 1px solid var(--lwt-toolbar-field-border-color, ThreeDShadow);
@@ -60,28 +59,28 @@ html|input.findbar-textbox {
   width: 14em;
 }
 
-html|input.findbar-textbox:-moz-lwtheme {
+.findbar-textbox:-moz-lwtheme {
   background-color: var(--lwt-toolbar-field-background-color, -moz-Field);
   color: var(--lwt-toolbar-field-color, -moz-FieldText);
 }
 
-html|input.findbar-textbox:focus {
+.findbar-textbox[focused="true"] {
   background-color: var(--lwt-toolbar-field-focus, var(--lwt-toolbar-field-background-color, -moz-Field));
   color: var(--lwt-toolbar-field-focus-color, var(--lwt-toolbar-field-color, -moz-FieldText));
   border-color: var(--toolbar-field-focus-border-color, Highlight);
 }
 
-html|input.findbar-textbox[status="notfound"] {
+.findbar-textbox[status="notfound"] {
   background-color: rgba(255,0,57,.3);
   color: inherit;
 }
 
-html|input.findbar-textbox[flash="true"] {
+.findbar-textbox[flash="true"] {
   background-color: rgba(255,233,0,.3);
   color: inherit;
 }
 
-html|input.findbar-textbox.minimal {
+.findbar-textbox.minimal {
   border-radius: 2px;
 }