Changeset 139958 in webkit

Timestamp:

Jan 16, 2013 8:22:41 PM (11 years ago)

Author:

morrita@google.com

Message:

Attr.ownerDocument should change if its parent's owner did
​https://bugs.webkit.org/show_bug.cgi?id=97644

Reviewed by Darin Adler.

Source/WebCore:

moveTreeToNewScope() didn't traverse its Attr instances. But it should.

Test: fast/dom/Attr/parent-adopt-node.html

• dom/ElementAttributeData.cpp:

(WebCore::ElementAttributeData::getExistingAttrs):
(WebCore):

• dom/ElementAttributeData.h:

(ElementAttributeData):

• dom/TreeScopeAdopter.cpp:

(WebCore::TreeScopeAdopter::moveTreeToNewScope):

LayoutTests:

• fast/dom/Attr/parent-adopt-node-expected.txt: Added.
• fast/dom/Attr/parent-adopt-node.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/Attr/parent-adopt-node-expected.txt (added)
• LayoutTests/fast/dom/Attr/parent-adopt-node.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Element.cpp (modified) (1 diff)
• Source/WebCore/dom/Element.h (modified) (2 diffs)
• Source/WebCore/dom/TreeScopeAdopter.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-16  MORITA Hajime  <morrita@google.com>
+
+        Attr.ownerDocument should change if its parent's owner did
+        https://bugs.webkit.org/show_bug.cgi?id=97644
+
+        Reviewed by Darin Adler.
+
+        * fast/dom/Attr/parent-adopt-node-expected.txt: Added.
+        * fast/dom/Attr/parent-adopt-node.html: Added.
+
 2013-01-16  Victor Carbune  <vcarbune@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-16  MORITA Hajime  <morrita@google.com>
+
+        Attr.ownerDocument should change if its parent's owner did
+        https://bugs.webkit.org/show_bug.cgi?id=97644
+
+        Reviewed by Darin Adler.
+
+        moveTreeToNewScope() didn't traverse its Attr instances. But it should.
+
+        Test: fast/dom/Attr/parent-adopt-node.html
+
+        * dom/ElementAttributeData.cpp:
+        (WebCore::ElementAttributeData::getExistingAttrs):
+        (WebCore):
+        * dom/ElementAttributeData.h:
+        (ElementAttributeData):
+        * dom/TreeScopeAdopter.cpp:
+        (WebCore::TreeScopeAdopter::moveTreeToNewScope):
+
 2013-01-16  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -1643 +1643 @@
 #endif
 
+const Vector<RefPtr<Attr> >& Element::attrNodeList()
+{
+    ASSERT(hasSyntheticAttrChildNodes());
+    return *attrNodeListForElement(this);
+}
+
 PassRefPtr<Attr> Element::setAttributeNode(Attr* attrNode, ExceptionCode& ec)
 {

trunk/Source/WebCore/dom/Element.h

@@ -38 +38 @@
 namespace WebCore {
 
+class Attr;
 class Attribute;
 class ClientRect;
@@ -229 +230 @@
     PassRefPtr<Attr> attrIfExists(const QualifiedName&);
     PassRefPtr<Attr> ensureAttr(const QualifiedName&);
-    
+
+    const Vector<RefPtr<Attr> >& attrNodeList();
+
     virtual CSSStyleDeclaration* style();
 

trunk/Source/WebCore/dom/TreeScopeAdopter.cpp

@@ -26 +26 @@
 #include "TreeScopeAdopter.h"
 
+#include "Attr.h"
 #include "Document.h"
 #include "ElementRareData.h"
@@ -61 +62 @@
         if (willMoveToNewDocument)
             moveNodeToNewDocument(node, oldDocument, newDocument);
+
+        if (!node->isElementNode())
+            continue;
+
+        if (node->hasSyntheticAttrChildNodes()) {
+            const Vector<RefPtr<Attr> >& attrs = toElement(node)->attrNodeList();
+            for (unsigned i = 0; i < attrs.size(); ++i)
+                moveTreeToNewScope(attrs[i].get());
+        }
 
         for (ShadowRoot* shadow = node->youngestShadowRoot(); shadow; shadow = shadow->olderShadowRoot()) {