[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[abarth at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 1f072b1f6a3354799bb6cb1dbd8ad4021fd5feca
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jul 25 20:05:54 2010 +0000

    2010-07-25  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            Recent HTML5 TreeBuilder Regression?  All canvas tests ASSERT
            https://bugs.webkit.org/show_bug.cgi?id=42948
    
            Remove ASSERT and replace with correct branch.  I put this ASSERT in
            to make sure we had test coverage for this branch.  I guess we do.  :)
    
            * html/HTMLConstructionSite.cpp:
            (WebCore::HTMLConstructionSite::attach):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64022 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 175320f..d6ef5ef 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-07-25  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Recent HTML5 TreeBuilder Regression?  All canvas tests ASSERT
+        https://bugs.webkit.org/show_bug.cgi?id=42948
+
+        Remove ASSERT and replace with correct branch.  I put this ASSERT in
+        to make sure we had test coverage for this branch.  I guess we do.  :)
+
+        * html/HTMLConstructionSite.cpp:
+        (WebCore::HTMLConstructionSite::attach):
+
 2010-07-25  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Timothy Hatcher.
diff --git a/WebCore/html/HTMLConstructionSite.cpp b/WebCore/html/HTMLConstructionSite.cpp
index e9bb762..0b17086 100644
--- a/WebCore/html/HTMLConstructionSite.cpp
+++ b/WebCore/html/HTMLConstructionSite.cpp
@@ -103,10 +103,8 @@ PassRefPtr<ChildType> HTMLConstructionSite::attach(Node* parent, PassRefPtr<Chil
     // |parent| to hold a ref at this point.  In the common case (at least
     // for elements), however, we'll get to use this ref in the stack of
     // open elements.
-    if (parent->attached()) {
-        ASSERT(!child->attached());
+    if (parent->attached() && !child->attached())
         child->attach();
-    }
     return child.release();
 }
 

-- 
WebKit Debian packaging