Merge 106dc0b into dc3eba2

Author: zcorpan

innerText/setter-tests.js

@@ -25,3 +25,11 @@ testHTML("<div><br>", "abc", "abc", "Existing <br> deleted");
 testHTML("<div>", "", "", "Assigning the empty string");
 testHTML("<div>", null, "", "Assigning null");
 testHTML("<div>", undefined, "undefined", "Assigning undefined");
+
+// Setting innerText on these should not throw
+["area", "base", "basefont", "bgsound", "br", "col", "embed", "frame", "hr",
+"image", "img", "input", "keygen", "link", "menuitem", "meta", "param",
+"source", "track", "wbr", "colgroup", "frameset", "head", "html", "table",
+"tbody", "tfoot", "thead", "tr"].forEach(function(tag) {
+  testText(document.createElement(tag), "abc", "abc", "innerText on <" + tag + "> element");
+});

innerText/setter.html

@@ -5,7 +5,13 @@
 <div id="container"></div>
 <script>
 function setupTest(context, plain) {
-  container.innerHTML = context;
+  // context is either a string or an element node
+  if (typeof context === "string") {
+    container.innerHTML = context;
+  } else {
+    container.innerHTML = "";
+    container.appendChild(context);
+  }
   var e = container.firstChild;
   while (e && e.nodeType != Node.ELEMENT_NODE) {
     e = e.nextSibling;