Changeset 140101 in webkit

Timestamp:

Jan 17, 2013 9:07:08 PM (11 years ago)

Author:

rafaelw@chromium.org

Message:

Ensure the parser adopts foster-parented children into the document of their parent.
​https://bugs.webkit.org/show_bug.cgi?id=107023

Reviewed by Adam Barth.

Source/WebCore:

Tests: fast/parser/foster-parent-adopted.html

fast/parser/foster-parent-adopted2.html

• html/parser/HTMLConstructionSite.cpp:

(WebCore::HTMLConstructionSite::insertTextNode):
(WebCore::HTMLConstructionSite::fosterParent):

LayoutTests:

This patch adopts the child into the parent's document after foster parenting to prevent a child from ending up in the tree with the wrong document.

• fast/parser/foster-parent-adopted-expected.txt: Added.
• fast/parser/foster-parent-adopted.html: Added.
• fast/parser/foster-parent-adopted2-expected.txt: Added.
• fast/parser/foster-parent-adopted2.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/parser/foster-parent-adopted-expected.txt (added)
• LayoutTests/fast/parser/foster-parent-adopted.html (added)
• LayoutTests/fast/parser/foster-parent-adopted2-expected.txt (added)
• LayoutTests/fast/parser/foster-parent-adopted2.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/parser/HTMLConstructionSite.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-17  Rafael Weinstein  <rafaelw@chromium.org>
+
+        Ensure the parser adopts foster-parented children into the document of their parent.
+        https://bugs.webkit.org/show_bug.cgi?id=107023
+
+        Reviewed by Adam Barth.
+
+        This patch adopts the child into the parent's document after foster parenting to prevent a child from ending up in the tree with the wrong document.
+
+        * fast/parser/foster-parent-adopted-expected.txt: Added.
+        * fast/parser/foster-parent-adopted.html: Added.
+        * fast/parser/foster-parent-adopted2-expected.txt: Added.
+        * fast/parser/foster-parent-adopted2.html: Added.
+
 2013-01-17  Shinya Kawanaka  <shinyak@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-17  Rafael Weinstein  <rafaelw@chromium.org>
+
+        Ensure the parser adopts foster-parented children into the document of their parent.
+        https://bugs.webkit.org/show_bug.cgi?id=107023
+
+        Reviewed by Adam Barth.
+
+        Tests: fast/parser/foster-parent-adopted.html
+               fast/parser/foster-parent-adopted2.html
+
+        * html/parser/HTMLConstructionSite.cpp:
+        (WebCore::HTMLConstructionSite::insertTextNode):
+        (WebCore::HTMLConstructionSite::fosterParent):
+
 2013-01-17  Martin Robinson  <mrobinson@igalia.com>
 

trunk/Source/WebCore/html/parser/HTMLConstructionSite.cpp

@@ -504 +504 @@
         ASSERT(currentPosition <= characters.length());
         task.child = textNode.release();
+
+        if (task.parent->document() != task.child->document())
+            task.parent->document()->adoptNode(task.child, ASSERT_NO_EXCEPTION);
+
         executeTask(task);
     }
@@ -640 +644 @@
     task.child = node;
     ASSERT(task.parent);
+
+    if (task.parent->document() != task.child->document())
+        task.parent->document()->adoptNode(task.child, ASSERT_NO_EXCEPTION);
+
     m_attachmentQueue.append(task);
 }