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 · b930df6 · b930df6
1 parent b72f71e
commit b930df6
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 201 deletions.
diff --git a/dom/html/HTMLPreElement.cpp b/dom/html/HTMLPreElement.cpp
@@ -376,6 +376,31 @@ aAttribute
 )
 const
 {
+if
+(
+!
+mNodeInfo
+-
+>
+Equals
+(
+nsGkAtoms
+:
+:
+pre
+)
+)
+{
+return
+nsGenericHTMLElement
+:
+:
+IsAttributeMapped
+(
+aAttribute
+)
+;
+}
 static
 const
 MappedAttributeEntry
@@ -427,6 +452,30 @@ 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
@@ -1311,6 +1311,7 @@
 listing
 "
 "
+Pre
 "
 )
 ;
@@ -1874,6 +1875,7 @@
 xmp
 "
 "
+Pre
 "
 )
 ;

diff --git a/parser/htmlparser/nsHTMLTagList.h b/parser/htmlparser/nsHTMLTagList.h
@@ -650,9 +650,10 @@ HTML_TAG
 link
 Link
 )
-HTML_HTMLELEMENT_TAG
+HTML_TAG
 (
 listing
+Pre
 )
 HTML_HTMLELEMENT_TAG
 (
@@ -949,9 +950,10 @@ HTML_HTMLELEMENT_TAG
 (
 wbr
 )
-HTML_HTMLELEMENT_TAG
+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
@@ -5491,195 +5491,6 @@ 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
 :

diff --git a/testing/web-platform/tests/html/dom/interfaces.html b/testing/web-platform/tests/html/dom/interfaces.html
@@ -16019,6 +16019,16 @@
 "
 )
 '
+'
+document
+.
+createElement
+(
+"
+plaintext
+"
+)
+'
 ]
 HTMLUnknownElement
 :
@@ -16381,16 +16391,6 @@
 createElement
 (
 "
-plaintext
-"
-)
-'
-'
-document
-.
-createElement
-(
-"
 xmp
 "
 )

diff --git a/testing/web-platform/tests/html/semantics/interfaces.js b/testing/web-platform/tests/html/semantics/interfaces.js
@@ -464,6 +464,7 @@ Link
 listing
 "
 "
+Pre
 "
 ]
 [
@@ -823,6 +824,7 @@ wbr
 xmp
 "
 "
+Pre
 "
 ]
 [
-Original file line number
+Diff line change
@@ Expand Up / @@ -1311,6 +1311,7 @@ @@
     listing
     "
     "
+    Pre
     "
     )
     ;
@@ Expand Down Expand Up / @@ -1874,6 +1875,7 @@ @@
     xmp
     "
     "
+    Pre
     "
     )
     ;
@@ Expand Down @@