Changeset 63037 in webkit

Timestamp:

Jul 9, 2010 8:47:55 PM (14 years ago)

Author:

abarth@webkit.org

Message:

2010-07-09 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

HTML5 tree builder should pass some LayoutTests
​https://bugs.webkit.org/show_bug.cgi?id=41991

Before this patch, we weren't attaching text nodes to the render tree,
which turns out to be important. :)

This patch fixes more than 10,000 LayoutTests.

• html/HTMLConstructionSite.cpp: (WebCore::HTMLConstructionSite::attach): (WebCore::HTMLConstructionSite::attachAtSite):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLConstructionSite.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-09  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        HTML5 tree builder should pass some LayoutTests
+        https://bugs.webkit.org/show_bug.cgi?id=41991
+
+        Before this patch, we weren't attaching text nodes to the render tree,
+        which turns out to be important.  :)
+
+        This patch fixes more than 10,000 LayoutTests.
+
+        * html/HTMLConstructionSite.cpp:
+        (WebCore::HTMLConstructionSite::attach):
+        (WebCore::HTMLConstructionSite::attachAtSite):
+
 2010-07-09  Patrick Gansterer  <paroga@paroga.com>
 

trunk/WebCore/html/HTMLConstructionSite.cpp

@@ -83 +83 @@
     if (m_redirectAttachToFosterParent) {
         fosterParent(child.get());
+        ASSERT(child->attached());
         return child.release();
     }
@@ -92 +93 @@
     // for elements), however, we'll get to use this ref in the stack of
     // open elements.
+    ASSERT(parent->attached());
+    ASSERT(!child->attached());
     child->attach();
     return child.release();
 }
 
-void HTMLConstructionSite::attachAtSite(const AttachmentSite& site, PassRefPtr<Node> child)
-{
+void HTMLConstructionSite::attachAtSite(const AttachmentSite& site, PassRefPtr<Node> prpChild)
+{
+    RefPtr<Node> child = prpChild;
+
     if (site.nextChild) {
         // FIXME: We need an insertElement which does not send mutation events.
         ExceptionCode ec = 0;
         site.parent->insertBefore(child, site.nextChild, ec);
-        // FIXME: Do we need to call attach()?
         ASSERT(!ec);
+        ASSERT(site.parent->attached());
+        if (!child->attached())
+            child->attach();
         return;
     }
     site.parent->parserAddChild(child);
-    // FIXME: Do we need to call attach()?
+    // It's slightly unfortunate that we need to hold a reference to child
+    // here to call attach().  We should investigate whether we can rely on
+    // |site.parent| to hold a ref at this point.
+    ASSERT(site.parent->attached());
+    if (!child->attached())
+        child->attach();
 }