Bug 1266851. Make <xmp> and <listing> use HTMLPreElement as their pri…

…mary interface, per <whatwg/html#1015>. r=peterv UltraBlame original commit: 6dd235136facc833619c153a6f27bfe96f709cb7
marco-c · Sep 30, 2019 · d41e56b · d41e56b
1 parent e68f4a7
commit d41e56b
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 34 deletions.
diff --git a/dom/html/HTMLPreElement.cpp b/dom/html/HTMLPreElement.cpp
@@ -64,6 +64,10 @@ HTMLPreElement::MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
 NS_IMETHODIMP_(bool)
 HTMLPreElement::IsAttributeMapped(const nsIAtom* aAttribute) const
 {
+  if (!mNodeInfo->Equals(nsGkAtoms::pre)) {
+    return nsGenericHTMLElement::IsAttributeMapped(aAttribute);
+  }
+
   static const MappedAttributeEntry attributes[] = {
     { &nsGkAtoms::wrap },
     { nullptr },
@@ -80,6 +84,10 @@ HTMLPreElement::IsAttributeMapped(const nsIAtom* aAttribute) const
 nsMapRuleToAttributesFunc
 HTMLPreElement::GetAttributeMappingFunction() const
 {
+  if (!mNodeInfo->Equals(nsGkAtoms::pre)) {
+    return nsGenericHTMLElement::GetAttributeMappingFunction();
+  }
+
   return &MapAttributesIntoRule;
 }
 

diff --git a/dom/html/test/test_bug389797.html b/dom/html/test/test_bug389797.html
@@ -166,7 +166,7 @@
 HTML_TAG("legend", "Legend");
 HTML_TAG("li", "LI");
 HTML_TAG("link", "Link");
-HTML_TAG("listing", "");
+HTML_TAG("listing", "Pre");
 HTML_TAG("main", "");
 HTML_TAG("map", "Map");
 HTML_TAG("mark", "");
@@ -223,7 +223,7 @@
 HTML_TAG("ul", "UList");
 HTML_TAG("var", "");
 HTML_TAG("wbr", "");
-HTML_TAG("xmp", "");
+HTML_TAG("xmp", "Pre");
 
 function tagName(aTag) {
   return "<" + aTag + ">";

diff --git a/parser/htmlparser/nsHTMLTagList.h b/parser/htmlparser/nsHTMLTagList.h
@@ -105,7 +105,7 @@ HTML_TAG(label, Label)
 HTML_TAG(legend, Legend)
 HTML_TAG(li, LI)
 HTML_TAG(link, Link)
-HTML_HTMLELEMENT_TAG(listing)
+HTML_TAG(listing, Pre)
 HTML_HTMLELEMENT_TAG(main)
 HTML_TAG(map, Map)
 HTML_HTMLELEMENT_TAG(mark)
@@ -170,7 +170,7 @@ HTML_TAG(ul, SharedList)
 HTML_HTMLELEMENT_TAG(var)
 HTML_TAG(video, Video)
 HTML_HTMLELEMENT_TAG(wbr)
-HTML_HTMLELEMENT_TAG(xmp)
+HTML_TAG(xmp, Pre)
 
 
 

diff --git a/testing/web-platform/meta/html/dom/interfaces.html.ini b/testing/web-platform/meta/html/dom/interfaces.html.ini
@@ -694,33 +694,6 @@
   [Stringification of document.createElement("basefont")]
     expected: FAIL
 
-  [HTMLPreElement must be primary interface of document.createElement("listing")]
-    expected: FAIL
-
-  [Stringification of document.createElement("listing")]
-    expected: FAIL
-
-  [HTMLPreElement interface: document.createElement("listing") must inherit property "width" with the proper type (0)]
-    expected: FAIL
-
-  [HTMLPreElement must be primary interface of document.createElement("plaintext")]
-    expected: FAIL
-
-  [Stringification of document.createElement("plaintext")]
-    expected: FAIL
-
-  [HTMLPreElement interface: document.createElement("plaintext") must inherit property "width" with the proper type (0)]
-    expected: FAIL
-
-  [HTMLPreElement must be primary interface of document.createElement("xmp")]
-    expected: FAIL
-
-  [Stringification of document.createElement("xmp")]
-    expected: FAIL
-
-  [HTMLPreElement interface: document.createElement("xmp") must inherit property "width" with the proper type (0)]
-    expected: FAIL
-
   [HTMLAnchorElement interface: document.createElement("a") must inherit property "ping" with the proper type (2)]
     expected: FAIL
 

diff --git a/testing/web-platform/tests/html/dom/interfaces.html b/testing/web-platform/tests/html/dom/interfaces.html
@@ -3243,6 +3243,7 @@ <h1>HTML IDL tests</h1>
       'document.createElement("wbr")',
       'document.createElement("summary")',
       'document.createElement("acronym")',
+      'document.createElement("plaintext")',
     ],
     HTMLUnknownElement: [
       'document.createElement("blink")',
@@ -3279,7 +3280,6 @@ <h1>HTML IDL tests</h1>
     HTMLPreElement: [
       'document.createElement("pre")',
       'document.createElement("listing")',
-      'document.createElement("plaintext")',
       'document.createElement("xmp")',
     ],
     HTMLQuoteElement: [

diff --git a/testing/web-platform/tests/html/semantics/interfaces.js b/testing/web-platform/tests/html/semantics/interfaces.js
@@ -58,7 +58,7 @@ var elements = [
   ["legend", "Legend"],
   ["li", "LI"],
   ["link", "Link"],
-  ["listing", ""],
+  ["listing", "Pre"],
   ["map", "Map"],
   ["marquee", "Marquee"],
   ["menu", "Menu"],
@@ -105,7 +105,7 @@ var elements = [
   ["var", ""],
   ["video", "Video"],
   ["wbr", ""],
-  ["xmp", ""],
+  ["xmp", "Pre"],
   ["section", ""],
   ["nav", ""],
   ["article", ""],