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

[hyatt at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 71e40730ba6de8131f8cb731a2f8677faca80989
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 16 22:18:33 2010 +0000

    Fix for regression from my previous check-in.  Make sure not to move the LayoutRepainter line
    below the setHeight(0) call.  This meant it snagged the wrong rectangle and we ended up repainting
    the world.
    
    Reviewed by Eric Seidel.
    
    * rendering/RenderBlock.cpp:
    (WebCore::RenderBlock::layoutBlock):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67673 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d6f8b8a..d369cea 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-16  David Hyatt  <hyatt at apple.com>
+
+        Reviewed by Eric Seidel.
+
+        Fix for regression from my previous check-in.  Make sure not to move the LayoutRepainter line
+        below the setHeight(0) call.  This meant it snagged the wrong rectangle and we ended up repainting
+        the world.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::layoutBlock):
+
 2010-09-16  takano takumi  <takano1 at asia.apple.com>
 
         Reviewed by Dave Hyatt.
diff --git a/WebCore/rendering/RenderBlock.cpp b/WebCore/rendering/RenderBlock.cpp
index 63d1f30..a569d0c 100644
--- a/WebCore/rendering/RenderBlock.cpp
+++ b/WebCore/rendering/RenderBlock.cpp
@@ -1121,6 +1121,8 @@ void RenderBlock::layoutBlock(bool relayoutChildren, int pageHeight)
     if (!relayoutChildren && layoutOnlyPositionedObjects())
         return;
 
+    LayoutRepainter repainter(*this, m_everHadLayout && checkForRepaintDuringLayout());
+
     int oldWidth = width();
     int oldColumnWidth = desiredColumnWidth();
 
@@ -1159,7 +1161,6 @@ void RenderBlock::layoutBlock(bool relayoutChildren, int pageHeight)
             colInfo->clearForcedBreaks();
     }
 
-    LayoutRepainter repainter(*this, m_everHadLayout && checkForRepaintDuringLayout());
     LayoutStateMaintainer statePusher(view(), this, IntSize(x(), y()), hasColumns() || hasTransform() || hasReflection(), pageHeight, colInfo);
 
     // We use four values, maxTopPos, maxTopNeg, maxBottomPos, and maxBottomNeg, to track

-- 
WebKit Debian packaging