[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 2ba0c7bba90651db98a7e4fedd3153ffc325fa4b
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 1 03:32:21 2010 +0000

    Refinement to previous checkin for pagination of block-level replaced elements.  Don't bother to
    paginate floating block-level replaced elements for now.
    
    Reviewed by Adam Roben.
    
    Added fast/multicol/float-pagination-failure.html
    
    * rendering/RenderBlock.cpp:
    (WebCore::RenderBlock::paintChildren):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66572 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c6dddf8..a2e2ac0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-31  Dave Hyatt  <hyatt at apple.com>
+
+        Reviewed by Adam Roben.
+
+        Refinement to previous checkin for pagination of block-level replaced elements.  Don't bother to
+        paginate floating block-level replaced elements for now.
+
+        Added fast/multicol/float-pagination-failure.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::paintChildren):
+
 2010-08-31  Kinuko Yasuda  <kinuko at chromium.org>
 
         Reviewed by Jian Li.
diff --git a/WebCore/rendering/RenderBlock.cpp b/WebCore/rendering/RenderBlock.cpp
index 1ef5c9d..27bc0c1 100644
--- a/WebCore/rendering/RenderBlock.cpp
+++ b/WebCore/rendering/RenderBlock.cpp
@@ -2122,7 +2122,7 @@ void RenderBlock::paintChildren(PaintInfo& paintInfo, int tx, int ty)
             return;
         }
 
-        if (child->isReplaced() && usePrintRect && child->height() <= renderView->printRect().height()) {
+        if (!child->isFloating() && child->isReplaced() && usePrintRect && child->height() <= renderView->printRect().height()) {
             // Paginate block-level replaced elements.
             if (ty + child->y() + child->height() > renderView->printRect().bottom()) {
                 if (ty + child->y() < renderView->truncatedAt())

-- 
WebKit Debian packaging