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

[jamesr at google.com]

The following commit has been merged in the debian/experimental branch:
commit ba1a3272fc86f1350769745168fc841df306d060
Author: jamesr at google.com <jamesr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 13 18:21:19 2010 +0000

    2010-07-13  James Robinson  <jamesr at chromium.org>
    
            Reviewed by Simon Fraser.
    
            REGRESSION(55056) debug builds ASSERT falsely on pages with animations
            https://bugs.webkit.org/show_bug.cgi?id=42175
    
            Revision 55065 added some repaint box precomputation and some debug ASSERT()ions
            to ensure the precomputed values were valid.  However, if animations are enabled and
            not hardware accelerated, the repaint box dimensions become time-dependent and the
            ASSERT()s can trigger.  This can make it impossible to interactively debug pages
            like google maps.
    
            https://bugs.webkit.org/show_bug.cgi?id=37048 is another example of an assertion
            failing due to time dependent animation values.
    
            * rendering/RenderObject.cpp:
            (WebCore::RenderObject::repaintAfterLayoutIfNeeded):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63226 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b1cdee2..06faa6f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2010-07-13  James Robinson  <jamesr at chromium.org>
+
+        Reviewed by Simon Fraser.
+
+        REGRESSION(55056) debug builds ASSERT falsely on pages with animations
+        https://bugs.webkit.org/show_bug.cgi?id=42175
+
+        Revision 55065 added some repaint box precomputation and some debug ASSERT()ions
+        to ensure the precomputed values were valid.  However, if animations are enabled and
+        not hardware accelerated, the repaint box dimensions become time-dependent and the
+        ASSERT()s can trigger.  This can make it impossible to interactively debug pages
+        like google maps.
+
+        https://bugs.webkit.org/show_bug.cgi?id=37048 is another example of an assertion
+        failing due to time dependent animation values.
+
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::repaintAfterLayoutIfNeeded):
+
 2010-07-10  Zhenyao Mo  <zmo at google.com>
 
         Reviewed by Darin Fisher.
diff --git a/WebCore/rendering/RenderObject.cpp b/WebCore/rendering/RenderObject.cpp
index 87d6068..d3213b6 100644
--- a/WebCore/rendering/RenderObject.cpp
+++ b/WebCore/rendering/RenderObject.cpp
@@ -1354,7 +1354,8 @@ bool RenderObject::repaintAfterLayoutIfNeeded(RenderBoxModelObject* repaintConta
     if (v->printing())
         return false; // Don't repaint if we're printing.
 
-    ASSERT(!newBoundsPtr || *newBoundsPtr == clippedOverflowRectForRepaint(repaintContainer));
+    // This ASSERT fails due to animations.  See https://bugs.webkit.org/show_bug.cgi?id=37048
+    // ASSERT(!newBoundsPtr || *newBoundsPtr == clippedOverflowRectForRepaint(repaintContainer));
     IntRect newBounds = newBoundsPtr ? *newBoundsPtr : clippedOverflowRectForRepaint(repaintContainer);
     IntRect newOutlineBox;
 
@@ -1363,7 +1364,8 @@ bool RenderObject::repaintAfterLayoutIfNeeded(RenderBoxModelObject* repaintConta
     if (!fullRepaint && style()->borderFit() == BorderFitLines)
         fullRepaint = true;
     if (!fullRepaint) {
-        ASSERT(!newOutlineBoxRectPtr || *newOutlineBoxRectPtr == outlineBoundsForRepaint(repaintContainer));
+        // This ASSERT fails due to animations.  See https://bugs.webkit.org/show_bug.cgi?id=37048
+        // ASSERT(!newOutlineBoxRectPtr || *newOutlineBoxRectPtr == outlineBoundsForRepaint(repaintContainer));
         newOutlineBox = newOutlineBoxRectPtr ? *newOutlineBoxRectPtr : outlineBoundsForRepaint(repaintContainer);
         if (newOutlineBox.location() != oldOutlineBox.location() || (mustRepaintBackgroundOrBorder() && (newBounds != oldBounds || newOutlineBox != oldOutlineBox)))
             fullRepaint = true;

-- 
WebKit Debian packaging