Bug 1513343 - Remove textarea binding and replace usages with html:textarea. r=bgrins,dao

Differential Revision: https://phabricator.services.mozilla.com/D15001 --HG-- extra : moz-landing-system : lando
2024-10-08 19:04:45 +00:00 · 2019-03-05 11:41:42 +00:00 · 2019-03-05 11:41:42 +00:00 · fa021187df
commit fa021187df
parent 24ef486f1d
37 changed files with 72 additions and 249 deletions
--- a/accessible/tests/mochitest/events/test_focus_general.xul
+++ b/accessible/tests/mochitest/events/test_focus_general.xul
@ -32,8 +32,6 @@

      gQueue.push(new synthFocus("textbox",
                                 new focusChecker(getNode("textbox").inputField)));
-      gQueue.push(new synthFocus("textbox_multiline",
-                                 new focusChecker(getNode("textbox_multiline").inputField)));
      gQueue.push(new synthFocusOnFrame("editabledoc"));
      gQueue.push(new synthFocus("radioclothes",
                                 new focusChecker("radiosweater")));
@ -88,7 +86,6 @@

    <vbox flex="1">
      <textbox id="textbox" value="hello"/>
-      <textbox id="textbox_multiline" multiline="true" value="hello"/>
      <iframe id="editabledoc" src="focus.html"/>
      <radiogroup id="radioclothes">
        <radio id="radiosweater" label="radiosweater"/>
--- a/accessible/tests/mochitest/states/test_textbox.xul
+++ b/accessible/tests/mochitest/states/test_textbox.xul
@ -43,15 +43,6 @@
                 EXT_STATE_SUPPORTS_AUTOCOMPLETION,
                 "password textbox");

-      //////////////////////////////////////////////////////////////////////////
-      // Textarea
-      testStates(getInput("textarea"),
-                 STATE_FOCUSABLE,
-                 EXT_STATE_EDITABLE | EXT_STATE_MULTI_LINE,
-                 STATE_PROTECTED | STATE_UNAVAILABLE,
-                 EXT_STATE_SUPPORTS_AUTOCOMPLETION,
-                 "multiline textbox");
-
      //////////////////////////////////////////////////////////////////////////
      // Readonly textbox
      testStates(getInput("readonly_textbox"),
@ -70,24 +61,6 @@
                 EXT_STATE_SUPPORTS_AUTOCOMPLETION,
                 "readonly textbox");

-      //////////////////////////////////////////////////////////////////////////
-      // Readonly textarea
-      testStates(getInput("readonly_textarea"),
-                 STATE_FOCUSABLE | STATE_READONLY,
-                 EXT_STATE_EDITABLE | EXT_STATE_MULTI_LINE,
-                 STATE_PROTECTED | STATE_UNAVAILABLE,
-                 EXT_STATE_SUPPORTS_AUTOCOMPLETION,
-                 "readonly multiline textbox");
-
-      //////////////////////////////////////////////////////////////////////////
-      // Disabled textarea
-      testStates(getInput("disabled_textarea"),
-                 STATE_UNAVAILABLE,
-                 EXT_STATE_EDITABLE| EXT_STATE_MULTI_LINE,
-                 STATE_PROTECTED | STATE_FOCUSABLE,
-                 EXT_STATE_SUPPORTS_AUTOCOMPLETION,
-                 "readonly multiline textbox");
-
      //////////////////////////////////////////////////////////////////////////
      // Search textbox without search button, searches as you type and filters
      // a separate control.
@ -136,14 +109,9 @@
  <vbox flex="1">
    <textbox id="textbox"/>
    <textbox id="password" type="password"/>
-    <textbox id="textarea" multiline="true" cols="80" rows="5"/>

    <textbox id="readonly_textbox" readonly="true"/>
    <textbox id="disabled_textbox" disabled="true"/>
-    <textbox id="readonly_textarea" multiline="true" readonly="true"
-             cols="80" rows="5"/>
-    <textbox id="disabled_textarea" multiline="true" disabled="true"
-             cols="80" rows="5"/>

    <textbox id="searchbox" flex="1" type="search" results="historyTree"/>
    <textbox id="searchfield" placeholder="Search all add-ons"
--- a/accessible/tests/mochitest/text/test_general.xul
+++ b/accessible/tests/mochitest/text/test_general.xul
@ -75,6 +75,6 @@
  <label id="label1" value="Hello"/>
  <label id="label2">Hello</label>

-  <textbox id="tbox1" value="test" multiline="true"/>
+  <textbox id="tbox1" value="test"/>
  </vbox>
 </window>
--- a/accessible/tests/mochitest/tree/test_txtctrl.xul
+++ b/accessible/tests/mochitest/tree/test_txtctrl.xul
@ -38,9 +38,6 @@
      // default textbox
      testAccessibleTree("txc", accTree);

-      // multiline
-      testAccessibleTree("txc_multiline", accTree);
-
      //////////////////////////////////////////////////////////////////////////
      // search textbox
      accTree =
@ -164,7 +161,6 @@
      <textbox id="txc_search_searchbutton" searchbutton="true" type="search" value="hello"/>
      <textbox id="txc_number" type="number" value="44"/>
      <textbox id="txc_password" type="password" value="hello"/>
-      <textbox id="txc_multiline" multiline="true" value="hello"/>
      <textbox id="txc_autocomplete" type="autocomplete" value="hello"/>
    </vbox>
  </hbox>
--- a/browser/components/controlcenter/content/panel.inc.xul
+++ b/browser/components/controlcenter/content/panel.inc.xul
@ -330,7 +330,7 @@
          </vbox>
          <vbox class="identity-popup-breakageReportView-collection-section">
            <label>&contentBlocking.breakageReportView.collection.comments.label;</label>
-            <textbox multiline="true" id="identity-popup-breakageReportView-collection-comments"/>
+            <html:textarea id="identity-popup-breakageReportView-collection-comments"/>
          </vbox>
        </vbox>
        <vbox id="identity-popup-breakageReportView-footer"
--- a/browser/components/preferences/connection.xul
+++ b/browser/components/preferences/connection.xul
@ -140,7 +140,7 @@
  </groupbox>
  <separator class="thin"/>
  <label data-l10n-id="connection-proxy-noproxy" control="networkProxyNone"/>
-  <textbox id="networkProxyNone" preference="network.proxy.no_proxies_on" multiline="true" rows="2"/>
+  <html:textarea id="networkProxyNone" preference="network.proxy.no_proxies_on" rows="2"/>
  <label control="networkProxyNone" data-l10n-id="connection-proxy-noproxy-desc" />
  <checkbox id="autologinProxy"
            data-l10n-id="connection-proxy-autologin"
--- a/browser/components/preferences/in-content/tests/browser_connection.js
+++ b/browser/components/preferences/in-content/tests/browser_connection.js
@ -52,8 +52,8 @@ function runConnectionTests(win) {
  let networkProxyTypePref = win.Preferences.get("network.proxy.type");

  // make sure the networkProxyNone textbox is formatted properly
-  is(networkProxyNone.getAttribute("multiline"), "true",
-     "networkProxyNone textbox is multiline");
+  is(networkProxyNone.localName, "textarea",
+     "networkProxyNone is a textarea");
  is(networkProxyNone.getAttribute("rows"), "2",
     "networkProxyNone textbox has two rows");

--- a/browser/components/preferences/in-content/tests/browser_extension_controlled.js
+++ b/browser/components/preferences/in-content/tests/browser_extension_controlled.js
@ -757,7 +757,7 @@ add_task(async function testExtensionControlledProxyConfig() {
        return {
          manualControls: [
            ...manualControlContainer.querySelectorAll("label[data-l10n-id]:not([control=networkProxyNone])"),
-            ...manualControlContainer.querySelectorAll("textbox:not(#networkProxyNone)"),
+            ...manualControlContainer.querySelectorAll("textbox"),
            ...manualControlContainer.querySelectorAll("checkbox"),
            ...doc.querySelectorAll("#networkProxySOCKSVersion > radio")],
          pacControls: [doc.getElementById("networkProxyAutoconfigURL")],
--- a/dom/xslt/tests/XSLTMark/XSLTMark.xul
+++ b/dom/xslt/tests/XSLTMark/XSLTMark.xul
@ -9,6 +9,7 @@
        title="XSLTMark"
        onload="view.onLoad()"
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns:html="http://www.w3.org/1999/xhtml"
        orient="vertical">
 <script type="application/x-javascript" src="XSLTMark-static.js" />
 <script type="application/x-javascript" src="XSLTMark-test.js" />
@ -44,9 +45,9 @@
  <progressmeter id="totalProgress" mode="normal" value="0" flex="2"/>
 </hbox>
 <hbox flex="1">
-  <textbox id="transformOutput" class="out" readonly="true" multiline="true" flex="1"/>
+  <html:textarea id="transformOutput" class="out" readonly="true" flex="1"/>
 </hbox>
 <hbox flex="1">
-  <textbox id="transformDetailedOutput" class="out" readonly="true" multiline="true" flex="1"/>
+  <html:textarea id="transformDetailedOutput" class="out" readonly="true" flex="1"/>
 </hbox>
 </window>
--- a/dom/xul/test/test_bug199692.xul
+++ b/dom/xul/test/test_bug199692.xul
@ -28,7 +28,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=199692
 <vbox id="content" style="position: relative;"
 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
  <xul:label id="non-anon-label" value="a textbox!:" control="textbox"/>
-  <xul:textbox id="textbox" multiline="true" rows="4" />
+  <html:textarea id="textbox" rows="4"/>
  <xul:radiogroup style="outline: 2px solid orange;">
    <xul:radio id="unselected-radio" label="Orange" style="outline: 2px solid red;"/>
    <xul:radio id="selected-radio" label="Violet" selected="true"/>
@ -62,27 +62,27 @@ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
    return { "x": e.getBoundingClientRect().x + e.getBoundingClientRect().width - d,
             "y": e.getBoundingClientRect().y + d + 15 };
  }
-  
+
  function test(ptFunc, id, message) {
    var pt = ptFunc($(id));
    var e = document.elementFromPoint(pt.x, pt.y);
    ok(e != null, message + " (returned null)");
    is(e.id, id, message);
  }
-  
+
  function do_test() {
    // Avoid hardcoding x,y pixel values, to better deal with differing default
    // font sizes or other layout defaults.
-    
+
    test(middle, 'textbox', "Point within textbox should return textbox element");
    test(lower_right, 'textbox', "Point on textbox's scrollbar should return textbox element");
    test(scrollbar_button, 'textbox', "Point on textbox's scrollbar button should return textbox element");
    test(middle, 'non-anon-label', "Point on label should return label");
    test(upper_left, 'bound', "Point on XBL content should return element with -moz-binding style");
-    
+
    SimpleTest.finish();
  }
-  $("textbox").setAttribute("value", 
+  $("textbox").setAttribute("value",
      "lorem ipsum dolor sit amet " +
      "lorem ipsum dolor sit amet " +
      "lorem ipsum dolor sit amet " +
--- a/editor/reftests/xul/emptymultiline-1.xul
+++ b/editor/reftests/xul/emptymultiline-1.xul
@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="resource://reftest/input.css" type="text/css"?>
-
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        xmlns:html="http://www.w3.org/1999/xhtml"
-        title="Textbox tests">
-
-  <script type="text/javascript" src="platform.js"/>
-
-  <textbox multiline="true"/>
-      
-</window>
--- a/editor/reftests/xul/emptymultiline-2.xul
+++ b/editor/reftests/xul/emptymultiline-2.xul
@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="resource://reftest/input.css" type="text/css"?>
-
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        xmlns:html="http://www.w3.org/1999/xhtml"
-        title="Textbox tests">
-
-  <script type="text/javascript" src="platform.js"/>
-
-  <textbox multiline="true" rows="10"/>
-      
-</window>
--- a/editor/reftests/xul/emptymultiline-ref.xul
+++ b/editor/reftests/xul/emptymultiline-ref.xul
@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="resource://reftest/input.css" type="text/css"?>
-
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        xmlns:html="http://www.w3.org/1999/xhtml"
-        title="Textbox tests">
-
-  <script type="text/javascript" src="platform.js"/>
-
-  <html:textarea rows="10" style="resize: none;"/>
-      
-</window>
--- a/editor/reftests/xul/input.css
+++ b/editor/reftests/xul/input.css
@ -1,30 +1,18 @@
@namespace url('http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul');
@namespace html url('http://www.w3.org/1999/xhtml');

-:root > html|input,
-:root > html|textarea {
+:root > html|input {
  margin: 2px 4px;
  padding: 2px 2px 3px;
  padding-inline-start: 5px;
 }

-#mac > html|input,
-#mac > html|textarea {
+#mac > html|input {
  margin: 4px;
  padding: 0 1px;
 }

-textbox[multiline="true"],
-html|textarea {
-  border: none !important;
-  -moz-appearance: none !important;
-  background-color: white !important;
-  border-top-right-radius: 0;
-  border-bottom-left-radius: 0;
-}
-
-html|input,
-html|textarea {
+html|input {
  font: inherit;
 }

--- a/editor/reftests/xul/reftest.list
+++ b/editor/reftests/xul/reftest.list
@ -4,8 +4,6 @@ fails-if(Android) skip-if(winWidget) == empty-1.xul empty-ref.xul # Windows: bug
 # Therefore, the equlity tests below should be marked as failing.
 fails-if(Android) fails-if(windowsDefaultTheme&&/^Windows\x20NT\x20(5\.[12]|6\.[012]|10\.0)/.test(http.oscpu)) == autocomplete-1.xul autocomplete-ref.xul # bug 783658
 fails-if(Android) fails-if(windowsDefaultTheme&&/^Windows\x20NT\x20(5\.[12]|6\.[012]|10\.0)/.test(http.oscpu)) == emptyautocomplete-1.xul emptyautocomplete-ref.xul # bug 783658
-!= emptymultiline-1.xul emptymultiline-ref.xul
-fails-if(Android) == emptymultiline-2.xul emptymultiline-ref.xul # bug 783658
 fails-if(Android) skip-if(winWidget) == emptytextbox-1.xul emptytextbox-ref.xul # Windows: bug 1239170
 fails-if(Android) skip-if(winWidget) == emptytextbox-2.xul emptytextbox-ref.xul # Windows: bug 1239170
 != emptytextbox-4.xul emptytextbox-ref.xul
--- a/layout/base/tests/chrome/chrome.ini
+++ b/layout/base/tests/chrome/chrome.ini
@ -21,7 +21,6 @@ support-files =
 [test_bug396367-2.html]
 [test_bug420499.xul]
 [test_bug458898.html]
-[test_bug504311.xul]
 [test_bug514660.xul]
 [test_bug533845.xul]
 skip-if = os == 'linux' && !debug # Bug 1208197
--- a/layout/base/tests/chrome/test_bug504311.xul
+++ b/layout/base/tests/chrome/test_bug504311.xul
@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/css" href="chrome://global/skin"?>
-<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
-                 type="text/css"?>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=504311
-->
-<window title="Mozilla Bug 504311"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        onload="doTest()">
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-<body xmlns="http://www.w3.org/1999/xhtml">
-<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=504311"
-   target="_blank">Mozilla Bug 504311</a>
-</body>
-  <!-- test code goes here -->
-<script type="application/javascript">
-<![CDATA[
-SimpleTest.waitForExplicitFinish();
-
-function doTest()
-{
-  var tb = document.getElementById("tb01");
-  var inputField = tb.inputField;
-  var editor = inputField.editor;
-  editor = editor.QueryInterface(Ci.nsIPlaintextEditor);
-  editor.wrapWidth = -1;
-
-  ok(true, "Didn't crash");
-  SimpleTest.finish();
-}
-]]></script>
-<textbox id="tb01" multiline="true"/>
-</window>
--- a/layout/xul/reftest/reftest.list
+++ b/layout/xul/reftest/reftest.list
@ -1,5 +1,3 @@
-fails-if(Android) == textbox-multiline-noresize.xul textbox-multiline-ref.xul # reference is blank on Android (due to no native theme support?)
-!= textbox-multiline-resize.xul textbox-multiline-ref.xul
 == popup-explicit-size.xul popup-explicit-size-ref.xul
 random-if(Android) == image-size.xul image-size-ref.xul
 == image-scaling-min-height-1.xul image-scaling-min-height-1-ref.xul
--- a/layout/xul/reftest/textbox-multiline-noresize.xul
+++ b/layout/xul/reftest/textbox-multiline-noresize.xul
@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<window align="start" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<textbox style="margin: 0;" multiline="true" width="100" height="100"/>
-</window>
--- a/layout/xul/reftest/textbox-multiline-resize.xul
+++ b/layout/xul/reftest/textbox-multiline-resize.xul
@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<window align="start" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<textbox style="margin: 0;" resizable="true" multiline="true" width="100" height="100"/>
-</window>
--- a/security/manager/pki/resources/content/certViewer.js
+++ b/security/manager/pki/resources/content/certViewer.js
@ -220,7 +220,7 @@ function addAttributeFromCert(nodeName, value) {
    document.l10n.setAttributes(node, "not-present");
    return;
  }
-  node.setAttribute("value", value);
+  node.value = value;
 }

 /**
--- a/security/manager/pki/resources/content/certViewer.xul
+++ b/security/manager/pki/resources/content/certViewer.xul
@ -22,6 +22,7 @@
 </linkset>

 <script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
+<script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
 <script type="application/javascript"
        src="chrome://pippki/content/certViewer.js"/>
 <html:style>
@ -40,6 +41,8 @@
  }
 </html:style>

+#include ../../../../../toolkit/content/editMenuCommands.inc.xul
+
  <tabbox flex="1">
    <tabs>
      <tab id="general_tab" data-l10n-id="certmgr-detail-general-tab-title"/>
@ -113,8 +116,8 @@
          <tr>
            <th scope="row" data-l10n-id="certmgr-cert-detail-sha-256-fingerprint"></th>
            <td>
-              <xul:textbox id="sha256fingerprint" class="plain" readonly="true" multiline="true"
-                       style="height: 6ex; width: 48ch; font-family: monospace;"/>
+              <textarea id="sha256fingerprint" class="plain" readonly="true"
+                        style="height: 6ex; width: 48ch; font-family: monospace; background: none;"/>
            </td>
          </tr>
          <tr>
@ -142,9 +145,8 @@
        </tree>

        <label class="header" data-l10n-id="certmgr-fields" control="certDumpVal"/>
-        <textbox id="certDumpVal" multiline="true" flex="1"
-                 readonly="true" style="height: 11em; font-family: -moz-fixed;"/>
-
+        <html:textarea id="certDumpVal" flex="1" readonly="true"
+                       style="height: 11em; font-family: -moz-fixed;"/>
        <separator class="thin"/>
        <hbox>
          <button id="export_cert" class="normal" data-l10n-id="certmgr-export"
--- a/security/manager/pki/resources/content/clientauthask.xul
+++ b/security/manager/pki/resources/content/clientauthask.xul
@ -12,7 +12,8 @@


 <dialog id="certAuthAsk" title="&clientAuthAsk.title;"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+  xmlns:html="http://www.w3.org/1999/xhtml"
  buttons="accept,cancel"
  ondialogaccept="return doOK();"
  ondialogcancel="return doCancel();"
@ -24,6 +25,9 @@

 <script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
 <script type="application/javascript" src="chrome://pippki/content/clientauthask.js"/>
+<script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
+
+#include ../../../../../toolkit/content/editMenuCommands.inc.xul

 <description style="font-weight: bold;">&clientAuthAsk.message1;</description>
 <description id="hostname"/>
@ -38,8 +42,7 @@
    <menupopup/>
 </menulist>
 <description>&clientAuthAsk.message3;</description>
-<textbox readonly="true" id="details" multiline="true"
-  style="height: 11em;"/>
+<html:textarea readonly="true" id="details" style="height: 11em;"/>
 <checkbox id="rememberBox" checked="true"/>

 </dialog>
--- a/security/manager/pki/resources/jar.mn
+++ b/security/manager/pki/resources/jar.mn
@ -7,13 +7,13 @@ pippki.jar:
    content/pippki/certManager.js            (content/certManager.js)
    content/pippki/certManager.xul           (content/certManager.xul)
    content/pippki/certViewer.js             (content/certViewer.js)
-    content/pippki/certViewer.xul            (content/certViewer.xul)
+*   content/pippki/certViewer.xul            (content/certViewer.xul)
    content/pippki/changepassword.js         (content/changepassword.js)
    content/pippki/changepassword.xul        (content/changepassword.xul)
    content/pippki/choosetoken.js            (content/choosetoken.js)
    content/pippki/choosetoken.xul           (content/choosetoken.xul)
    content/pippki/clientauthask.js          (content/clientauthask.js)
-    content/pippki/clientauthask.xul         (content/clientauthask.xul)
+*   content/pippki/clientauthask.xul         (content/clientauthask.xul)
    content/pippki/createCertInfo.js         (content/createCertInfo.js)
    content/pippki/createCertInfo.xul        (content/createCertInfo.xul)
    content/pippki/deletecert.js             (content/deletecert.js)
--- a/toolkit/content/preferencesBindings.js
+++ b/toolkit/content/preferencesBindings.js
@ -446,6 +446,7 @@ const Preferences = window.Preferences = (function() {
      case "checkbox":
      case "input":
      case "radiogroup":
+      case "textarea":
      case "textbox":
      case "menulist":
        return true;
--- a/toolkit/content/widgets/textbox.xml
+++ b/toolkit/content/widgets/textbox.xml
@ -128,8 +128,7 @@
        <body>
          // According to https://html.spec.whatwg.org/#do-not-apply,
          // setSelectionRange() is only available on a limited set of input types.
-          if (this.inputField.type == "text" ||
-              this.inputField.tagName == "html:textarea") {
+          if (this.inputField.type == "text") {
            this.inputField.setSelectionRange( aSelectionStart, aSelectionEnd );
          }
        </body>
@ -396,13 +395,4 @@
      </handler>
    </handlers>
  </binding>
-
-  <binding id="textarea" extends="chrome://global/content/bindings/textbox.xml#textbox">
-    <content>
-      <xul:moz-input-box anonid="moz-input-box" flex="1" xbl:inherits="context,spellcheck">
-        <html:textarea class="textbox-textarea" anonid="input"
-                       xbl:inherits="xbl:text=value,disabled,tabindex,rows,cols,readonly,wrap,placeholder,mozactionhint,spellcheck"><children/></html:textarea>
-      </xul:moz-input-box>
-    </content>
-  </binding>
 </bindings>
--- a/toolkit/content/xul.css
+++ b/toolkit/content/xul.css
@ -519,25 +519,17 @@ textbox {
  text-shadow: none;
 }

-textbox[multiline="true"] {
-  -moz-binding: url("chrome://global/content/bindings/textbox.xml#textarea");
-}
-
-html|textarea.textbox-textarea {
-  resize: none;
-}
-
-textbox[resizable="true"] > moz-input-box > html|textarea.textbox-textarea {
-  resize: both;
-}
-
 textbox[type="search"] {
  -moz-binding: url("chrome://global/content/bindings/textbox.xml#search-textbox");
 }

+/* Prefix with (xul|*):root to workaround HTML tests loading xul.css */
+:root html|textarea:not([resizable="true"]) {
+  resize: none;
+}
+
@supports -moz-bool-pref("layout.css.emulate-moz-box-with-flex") {
-  html|*.textbox-input,
-  html|*.textbox-textarea {
+  html|*.textbox-input {
    /* Be block-level, so that -moz-box-flex can take effect, when we are an item
       in a -moz-box being emulated by modified modern flex. */
    display: block;
--- a/toolkit/mozapps/update/content/updates.xul
+++ b/toolkit/mozapps/update/content/updates.xul
@ -32,6 +32,9 @@

  <script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/>
  <script type="application/javascript" src="chrome://mozapps/content/update/updates.js"/>
+  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
+
+#include ../../../../toolkit/content/editMenuCommands.inc.xul

 #if defined(XP_MACOSX) && MOZ_BUILD_APP == browser
 #include ../../../../browser/base/content/macWindow.inc.xul
@ -142,8 +145,7 @@
    <vbox class="update-content" flex="1">
      <label id="errorIntro">&error.label;</label>
      <separator/>
-      <textbox class="plain" readonly="true" id="errorReason" multiline="true"
-               rows="3"/>
+      <html:textarea class="plain" readonly="true" id="errorReason" rows="3"/>
      <separator/>
      <label id="errorManual">&errorManual.label;</label>
      <hbox>
--- a/toolkit/themes/linux/global/global.css
+++ b/toolkit/themes/linux/global/global.css
@ -171,13 +171,6 @@ separator.groove[orient="vertical"] {
  margin-right: 0.4em;
 }

-.plain {
-  -moz-appearance: none;
-  margin: 0 !important;
-  border: none;
-  padding: 0;
-}
-
 description,
 label {
  cursor: default;
--- a/toolkit/themes/linux/global/textbox.css
+++ b/toolkit/themes/linux/global/textbox.css
@ -21,8 +21,7 @@ textbox {
  color: -moz-FieldText;
 }

-html|*.textbox-input,
-html|*.textbox-textarea {
+html|*.textbox-input {
  -moz-appearance: none;
  margin: 0;
  border: none;
@ -33,9 +32,6 @@ html|*.textbox-textarea {
  text-shadow: inherit;
  box-sizing: border-box;
  -moz-box-flex: 1;
-}
-
-html|*.textbox-input {
  text-align: inherit;
 }

@ -68,8 +64,7 @@ textbox.plain {
  border: none !important;
 }

-textbox.plain html|*.textbox-input,
-textbox.plain html|*.textbox-textarea {
+textbox.plain html|*.textbox-input {
  padding: 0px !important;
 }

--- a/toolkit/themes/osx/global/global.css
+++ b/toolkit/themes/osx/global/global.css
@ -8,6 +8,7 @@

 %include shared.inc
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml");

 %include ../../shared/global.inc.css

@ -132,13 +133,6 @@ separator.groove[orient="vertical"] {
  margin-right: 0.4em;
 }

-.plain {
-  -moz-appearance: none;
-  margin: 0 !important;
-  border: none;
-  padding: 0;
-}
-
 description,
 label {
  cursor: default;
@ -264,4 +258,3 @@ popupnotificationcontent {
 .popup-internal-box > .scrollbutton-down[disabled="true"] {
  visibility: collapse;
 }
-
--- a/toolkit/themes/osx/global/textbox.css
+++ b/toolkit/themes/osx/global/textbox.css
@ -14,8 +14,7 @@ textbox {
  color: -moz-FieldText;
 }

-html|*.textbox-input,
-html|*.textbox-textarea {
+html|*.textbox-input {
  -moz-appearance: none;
  margin: 0;
  border: none;
@ -55,8 +54,7 @@ textbox.plain {
  border: none !important;
 }

-textbox.plain html|*.textbox-input,
-textbox.plain html|*.textbox-textarea {
+textbox.plain html|*.textbox-input {
  padding: 0px !important;
 }

@ -77,7 +75,7 @@ textbox[type="search"] {
 .textbox-search-clear:not([disabled]) {
  cursor: default;
 }
- 
+
 .textbox-search-icons:not([selectedIndex="1"]) {
  visibility: hidden;
 }
--- a/toolkit/themes/shared/global.inc.css
+++ b/toolkit/themes/shared/global.inc.css
@ -2,6 +2,19 @@
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

+/* General styles */
+
+*|*.plain {
+  -moz-appearance: none;
+  margin: 0 !important;
+  border: none;
+  padding: 0;
+}
+
+html|textarea {
+  font: inherit;
+}
+
 /* Close icon */

 .close-icon {
--- a/toolkit/themes/shared/in-content/common.inc.css
+++ b/toolkit/themes/shared/in-content/common.inc.css
@ -372,13 +372,6 @@ xul|textbox {
  background-color: var(--in-content-box-background) !important;
 }

-/* The focus/border styles for nested textareas inside textbox[multiline] will
- * be provided by the textbox */
-xul|textbox[multiline] html|textarea {
-  border: none !important;
-  box-shadow: none !important;
-}
-
 xul|textbox {
  min-height: 30px;
  padding-right: 8px;
--- a/toolkit/themes/windows/global/global.css
+++ b/toolkit/themes/windows/global/global.css
@ -173,13 +173,6 @@ separator.groove[orient="vertical"] {
  margin-right: 0.4em;
 }

-.plain {
-  -moz-appearance: none;
-  margin: 0 !important;
-  border: none;
-  padding: 0;
-}
-
 description,
 label {
  cursor: default;
--- a/toolkit/themes/windows/global/textbox.css
+++ b/toolkit/themes/windows/global/textbox.css
@ -21,8 +21,7 @@ textbox {
  color: -moz-FieldText;
 }

-html|*.textbox-input,
-html|*.textbox-textarea {
+html|*.textbox-input {
  -moz-appearance: none;
  margin: 0;
  border: none;
@ -33,9 +32,6 @@ html|*.textbox-textarea {
  text-shadow: inherit;
  box-sizing: border-box;
  -moz-box-flex: 1;
-}
-
-html|*.textbox-input {
  text-align: inherit;
 }

@ -74,8 +70,7 @@ textbox.plain {
  border: none !important;
 }

-textbox.plain html|*.textbox-input,
-textbox.plain html|*.textbox-textarea {
+textbox.plain html|*.textbox-input {
  padding: 0px !important;
 }

@ -120,4 +115,3 @@ textbox:not([searchbutton]) > moz-input-box > .textbox-search-sign {
 toolbarpaletteitem > toolbaritem > textbox > moz-input-box > html|*.textbox-input {
  visibility: hidden;
 }
-
--- a/widget/tests/window_composition_text_querycontent.xul
+++ b/widget/tests/window_composition_text_querycontent.xul
@ -17,15 +17,15 @@
         onpopupshown="onPanelShown(event);"
         onpopuphidden="onPanelHidden(event);">
    <vbox id="vbox">
-      <textbox id="textbox" onfocus="onFocusPanelTextbox(event);"
-               multiline="true" cols="20" rows="4" style="font-size: 36px;"/>
+      <html:textarea id="textbox" onfocus="onFocusPanelTextbox(event);"
+                     cols="20" rows="4" style="font-size: 36px;"/>
    </vbox>
  </panel>

 <body  xmlns="http://www.w3.org/1999/xhtml">
 <p id="display">
 <div id="div" style="margin: 0; padding: 0; font-size: 36px;">Here is a text frame.</div>
-<textarea style="margin: 0;" id="textarea" cols="20" rows="4"></textarea><br/>
+<textarea style="margin: 0; font-family: -moz-fixed;" id="textarea" cols="20" rows="4"></textarea><br/>
 <iframe id="iframe" width="300" height="150"
        src="data:text/html,&lt;textarea id='textarea' cols='20' rows='4'&gt;&lt;/textarea&gt;"></iframe><br/>
 <iframe id="iframe2" width="300" height="150"
@ -37,7 +37,7 @@
 <input id="input" type="text"/><br/>
 </p>
 <div id="content" style="display: none">
-  
+
 </div>
 <pre id="test">
 </pre>
@ -3172,7 +3172,7 @@ function runCharAtPointTest(aFocusedEditor, aTargetName)
 {
  aFocusedEditor.value = "This is a test of the\nContent Events";
                       // 012345678901234567890  12345678901234
-                       // 0         1         2           3    
+                       // 0         1         2           3

  aFocusedEditor.focus();