Changeset 280913 in webkit

Timestamp:

Aug 11, 2021 9:39:55 AM (11 months ago)

Author:

Chris Dumez

Message:

HTMLMetaElement http-equiv should not be processed in shadow trees
​https://bugs.webkit.org/show_bug.cgi?id=228973

Reviewed by Geoffrey Garen.

LayoutTests/imported/w3c:

Rebaseline WPT test that is now passing.

• web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/not-in-shadow-tree-expected.txt:

Source/WebCore:

HTMLMetaElement http-equiv should not be processed in shadow trees:

• ​https://html.spec.whatwg.org/#attr-meta-http-equiv
• ​https://html.spec.whatwg.org/multipage/infrastructure.html#insert-an-element-into-a-document
• ​https://dom.spec.whatwg.org/#in-a-document-tree

Firefox and Chrome already match the specification here.

No new tests, rebaselined existing test.

• dom/Node.h:

(WebCore::Node::isInDocumentTree const):

• html/HTMLMetaElement.cpp:

(WebCore::HTMLMetaElement::attributeChanged):
(WebCore::HTMLMetaElement::process):

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/not-in-shadow-tree-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Node.h (modified) (1 diff)
• Source/WebCore/html/HTMLMetaElement.cpp (modified) (2 diffs)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2021-08-11  Chris Dumez  <cdumez@apple.com>
+
+        HTMLMetaElement http-equiv should not be processed in shadow trees
+        https://bugs.webkit.org/show_bug.cgi?id=228973
+
+        Reviewed by Geoffrey Garen.
+
+        Rebaseline WPT test that is now passing.
+
+        * web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/not-in-shadow-tree-expected.txt:
+
 2021-08-11  Chris Dumez  <cdumez@apple.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/not-in-shadow-tree-expected.txt

@@ -1 @@
-CONSOLE MESSAGE: Error: assert_unreached: Got more than 1 load event Reached unreachable code
 
-FAIL Meta refresh only applies while in the document tree, not in a shadow tree Error: assert_unreached: Got more than 1 load event Reached unreachable code
+PASS Meta refresh only applies while in the document tree, not in a shadow tree
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-08-11  Chris Dumez  <cdumez@apple.com>
+
+        HTMLMetaElement http-equiv should not be processed in shadow trees
+        https://bugs.webkit.org/show_bug.cgi?id=228973
+
+        Reviewed by Geoffrey Garen.
+
+        HTMLMetaElement http-equiv should not be processed in shadow trees:
+        - https://html.spec.whatwg.org/#attr-meta-http-equiv
+        - https://html.spec.whatwg.org/multipage/infrastructure.html#insert-an-element-into-a-document
+        - https://dom.spec.whatwg.org/#in-a-document-tree
+
+        Firefox and Chrome already match the specification here.
+
+        No new tests, rebaselined existing test.
+
+        * dom/Node.h:
+        (WebCore::Node::isInDocumentTree const):
+        * html/HTMLMetaElement.cpp:
+        (WebCore::HTMLMetaElement::attributeChanged):
+        (WebCore::HTMLMetaElement::process):
+
 2021-08-11  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/dom/Node.h

@@ -369 +369 @@
     bool isInTreeScope() const { return hasNodeFlag(NodeFlag::IsConnected) || hasNodeFlag(NodeFlag::IsInShadowTree); }
 
+    // https://dom.spec.whatwg.org/#in-a-document-tree
+    bool isInDocumentTree() const { return isConnected() && !isInShadowTree(); }
+
     bool isDocumentTypeNode() const { return nodeType() == DOCUMENT_TYPE_NODE; }
     virtual bool childTypeAllowed(NodeType) const { return false; }

trunk/Source/WebCore/html/HTMLMetaElement.cpp

@@ -93 +93 @@
     HTMLElement::attributeChanged(name, oldValue, newValue, reason);
 
-    if (!isConnected())
+    if (!isInDocumentTree())
         return;
 
@@ -153 +153 @@
 void HTMLMetaElement::process()
 {
-    // Changing a meta tag while it's not in the tree shouldn't have any effect on the document.
-    if (!isConnected())
+    // Changing a meta tag while it's not in the document tree shouldn't have any effect on the document.
+    if (!isInDocumentTree())
         return;