[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 5d7dc309d7cfcabe37c6b189d8d824ca15f71679
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 1 18:14:16 2010 +0000

    WebCore: https://bugs.webkit.org/show_bug.cgi?id=44963, overhanging floats aren't positioned properly when they occur
    in multi-column layout.  Don't let floats overhang in multi-column blocks, since they are part of the column layout.
    
    Reviewed by Dan Bernstein and Simon Fraser.
    
    fast/multicol/float-pagination-failure now succeeds, so will rename and move it.
    
    * rendering/RenderBlock.cpp:
    (WebCore::RenderBlock::addOverhangingFloats):
    
    LayoutTests: https://bugs.webkit.org/show_bug.cgi?id=44963, rename the float-paginate-failure test since it now
    succeeds.
    
    Reviewed by Dan Bernstein and Simon Fraser.
    
    * fast/multicol/float-paginate-failure.html: Removed.
    * fast/multicol/float-paginate.html: Added.
    * platform/mac/fast/multicol/float-paginate-expected.checksum: Added.
    * platform/mac/fast/multicol/float-paginate-expected.png: Added.
    * platform/mac/fast/multicol/float-paginate-expected.txt: Added.
    * platform/mac/fast/multicol/float-paginate-failure-expected.checksum: Removed.
    * platform/mac/fast/multicol/float-paginate-failure-expected.png: Removed.
    * platform/mac/fast/multicol/float-paginate-failure-expected.txt: Removed.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66612 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f807af0..ad7e2a0 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,19 @@
+2010-09-01  Dave Hyatt  <hyatt at apple.com>
+
+        Reviewed by Dan Bernstein and Simon Fraser.
+
+        https://bugs.webkit.org/show_bug.cgi?id=44963, rename the float-paginate-failure test since it now
+        succeeds.
+
+        * fast/multicol/float-paginate-failure.html: Removed.
+        * fast/multicol/float-paginate.html: Added.
+        * platform/mac/fast/multicol/float-paginate-expected.checksum: Added.
+        * platform/mac/fast/multicol/float-paginate-expected.png: Added.
+        * platform/mac/fast/multicol/float-paginate-expected.txt: Added.
+        * platform/mac/fast/multicol/float-paginate-failure-expected.checksum: Removed.
+        * platform/mac/fast/multicol/float-paginate-failure-expected.png: Removed.
+        * platform/mac/fast/multicol/float-paginate-failure-expected.txt: Removed.
+
 2010-09-01  Alejandro G. Castro  <alex at igalia.com>
 
         Reviewed by Martin Robinson.
diff --git a/LayoutTests/fast/multicol/float-paginate-failure.html b/LayoutTests/fast/multicol/float-paginate.html
similarity index 100%
rename from LayoutTests/fast/multicol/float-paginate-failure.html
rename to LayoutTests/fast/multicol/float-paginate.html
diff --git a/LayoutTests/platform/mac/fast/multicol/float-paginate-expected.checksum b/LayoutTests/platform/mac/fast/multicol/float-paginate-expected.checksum
new file mode 100644
index 0000000..6441ec8
--- /dev/null
+++ b/LayoutTests/platform/mac/fast/multicol/float-paginate-expected.checksum
@@ -0,0 +1 @@
+fdce268a43768633c7898ca380a09fd1
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/multicol/float-paginate-expected.png b/LayoutTests/platform/mac/fast/multicol/float-paginate-expected.png
new file mode 100644
index 0000000..b2ad59a
Binary files /dev/null and b/LayoutTests/platform/mac/fast/multicol/float-paginate-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/multicol/float-paginate-failure-expected.txt b/LayoutTests/platform/mac/fast/multicol/float-paginate-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac/fast/multicol/float-paginate-failure-expected.txt
rename to LayoutTests/platform/mac/fast/multicol/float-paginate-expected.txt
diff --git a/LayoutTests/platform/mac/fast/multicol/float-paginate-failure-expected.checksum b/LayoutTests/platform/mac/fast/multicol/float-paginate-failure-expected.checksum
deleted file mode 100644
index 8a2c7d2..0000000
--- a/LayoutTests/platform/mac/fast/multicol/float-paginate-failure-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-18c44251bd888db60df21c8c715fe6fc
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/multicol/float-paginate-failure-expected.png b/LayoutTests/platform/mac/fast/multicol/float-paginate-failure-expected.png
deleted file mode 100644
index 6962fcc..0000000
Binary files a/LayoutTests/platform/mac/fast/multicol/float-paginate-failure-expected.png and /dev/null differ
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0bdabec..5d6e88f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-01  Dave Hyatt  <hyatt at apple.com>
+
+        Reviewed by Dan Bernstein and Simon Fraser.
+
+        https://bugs.webkit.org/show_bug.cgi?id=44963, overhanging floats aren't positioned properly when they occur
+        in multi-column layout.  Don't let floats overhang in multi-column blocks, since they are part of the column layout.
+        
+        fast/multicol/float-pagination-failure now succeeds, so will rename and move it.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::addOverhangingFloats):
+
 2010-08-31  Kenneth Russell  <kbr at google.com>
 
         Reviewed by Simon Fraser.
diff --git a/WebCore/rendering/RenderBlock.cpp b/WebCore/rendering/RenderBlock.cpp
index 27bc0c1..5b2abe8 100644
--- a/WebCore/rendering/RenderBlock.cpp
+++ b/WebCore/rendering/RenderBlock.cpp
@@ -3529,7 +3529,7 @@ void RenderBlock::clearFloats()
 int RenderBlock::addOverhangingFloats(RenderBlock* child, int xoff, int yoff, bool makeChildPaintOtherFloats)
 {
     // Prevent floats from being added to the canvas by the root element, e.g., <html>.
-    if (child->hasOverflowClip() || !child->containsFloats() || child->isRoot())
+    if (child->hasOverflowClip() || !child->containsFloats() || child->isRoot() || child->hasColumns())
         return 0;
 
     int lowestFloatBottom = 0;

-- 
WebKit Debian packaging