Changeset 243734 in webkit

Timestamp:

Apr 1, 2019, 8:14:50 PM (7 years ago)

Author:

Chris Dumez

Message:

Attr nodes are not cloned properly
​https://bugs.webkit.org/show_bug.cgi?id=196466

Reviewed by Ryosuke Niwa.

LayoutTests/imported/w3c:

Rebaseline WPT test now that one more check is passing.

• web-platform-tests/dom/nodes/Document-importNode-expected.txt:

Source/WebCore:

Attr nodes are not cloned properly according to:

• ​https://dom.spec.whatwg.org/#concept-node-clone

A cloned Attr node should retain its prefix and namespace.

Both Gecko and Blink agree with the DOM specification here.

No new tests, rebaselined existing test.

• dom/Document.cpp:

(WebCore::Document::importNode):

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/dom/nodes/Document-importNode-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Document.cpp (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2019-04-01  Chris Dumez  <cdumez@apple.com>
+
+        Attr nodes are not cloned properly
+        https://bugs.webkit.org/show_bug.cgi?id=196466
+
+        Reviewed by Ryosuke Niwa.
+
+        Rebaseline WPT test now that one more check is passing.
+
+        * web-platform-tests/dom/nodes/Document-importNode-expected.txt:
+
 2019-04-01  Chris Dumez  <cdumez@apple.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/dom/nodes/Document-importNode-expected.txt

@@ -4 +4 @@
 PASS True 'deep' argument. 
 PASS False 'deep' argument. 
-FAIL Import an Attr node with namespace/prefix correctly. assert_equals: expected (string) "p" but got (object) null
+PASS Import an Attr node with namespace/prefix correctly. 
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-04-01  Chris Dumez  <cdumez@apple.com>
+
+        Attr nodes are not cloned properly
+        https://bugs.webkit.org/show_bug.cgi?id=196466
+
+        Reviewed by Ryosuke Niwa.
+
+        Attr nodes are not cloned properly according to:
+        - https://dom.spec.whatwg.org/#concept-node-clone
+
+        A cloned Attr node should retain its prefix and namespace.
+
+        Both Gecko and Blink agree with the DOM specification here.
+
+        No new tests, rebaselined existing test.
+
+        * dom/Document.cpp:
+        (WebCore::Document::importNode):
+
 2019-04-01  Said Abou-Hallawa  <sabouhallawa@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -989 +989 @@
         return nodeToImport.cloneNodeInternal(document(), deep ? CloningOperation::Everything : CloningOperation::OnlySelf);
 
-    case ATTRIBUTE_NODE:
-        // FIXME: This will "Attr::normalize" child nodes of Attr.
-        return Ref<Node> { Attr::create(*this, QualifiedName(nullAtom(), downcast<Attr>(nodeToImport).name(), nullAtom()), downcast<Attr>(nodeToImport).value()) };
-
+    case ATTRIBUTE_NODE: {
+        auto& attribute = downcast<Attr>(nodeToImport);
+        return Ref<Node> { Attr::create(*this, attribute.qualifiedName(), attribute.value()) };
+    }
     case DOCUMENT_NODE: // Can't import a document into another document.
     case DOCUMENT_TYPE_NODE: // FIXME: Support cloning a DocumentType node per DOM4.