Changeset 106673 in webkit

Timestamp:

Feb 3, 2012, 10:23:11 AM (15 years ago)

Author:

mitz@apple.com

Message:

Floating image leaves hole in previous column when wrapped to next column
​https://bugs.webkit.org/show_bug.cgi?id=77694

Reviewed by Darin Adler.

Source/WebCore:

Tests: fast/dynamic/float-moved-downwards-for-pagination-expected.html

fast/dynamic/float-moved-downwards-for-pagination.html

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::clearFloats): When determining which lines to dirty,
also check for changes to the top edge of the float, which can happen when
float gets pushed down by a pagination strut.

LayoutTests:

• fast/dynamic/float-moved-downwards-for-pagination-expected.html: Added.
• fast/dynamic/float-moved-downwards-for-pagination.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dynamic/float-moved-downwards-for-pagination-expected.html (added)
• LayoutTests/fast/dynamic/float-moved-downwards-for-pagination.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-02-03  Dan Bernstein  <mitz@apple.com>
+
+        Floating image leaves hole in previous column when wrapped to next column
+        https://bugs.webkit.org/show_bug.cgi?id=77694
+
+        Reviewed by Darin Adler.
+
+        * fast/dynamic/float-moved-downwards-for-pagination-expected.html: Added.
+        * fast/dynamic/float-moved-downwards-for-pagination.html: Added.
+
 2012-02-03  Alexis Menard  <alexis.menard@openbossa.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-03  Dan Bernstein  <mitz@apple.com>
+
+        Floating image leaves hole in previous column when wrapped to next column
+        https://bugs.webkit.org/show_bug.cgi?id=77694
+
+        Reviewed by Darin Adler.
+
+        Tests: fast/dynamic/float-moved-downwards-for-pagination-expected.html
+               fast/dynamic/float-moved-downwards-for-pagination.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::clearFloats): When determining which lines to dirty,
+        also check for changes to the top edge of the float, which can happen when
+        float gets pushed down by a pagination strut.
+
 2012-02-03  Alexis Menard  <alexis.menard@openbossa.org>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -3910 +3910 @@
                         changeLogicalTop = 0;
                         changeLogicalBottom = max(changeLogicalBottom, max(logicalBottom, oldLogicalBottom));
-                    } else if (logicalBottom != oldLogicalBottom) {
-                        changeLogicalTop = min(changeLogicalTop, min(logicalBottom, oldLogicalBottom));
-                        changeLogicalBottom = max(changeLogicalBottom, max(logicalBottom, oldLogicalBottom));
+                    } else {
+                        if (logicalBottom != oldLogicalBottom) {
+                            changeLogicalTop = min(changeLogicalTop, min(logicalBottom, oldLogicalBottom));
+                            changeLogicalBottom = max(changeLogicalBottom, max(logicalBottom, oldLogicalBottom));
+                        }
+                        LayoutUnit logicalTop = logicalTopForFloat(f);
+                        LayoutUnit oldLogicalTop = logicalTopForFloat(oldFloatingObject);
+                        if (logicalTop != oldLogicalTop) {
+                            changeLogicalTop = min(changeLogicalTop, min(logicalTop, oldLogicalTop));
+                            changeLogicalBottom = max(changeLogicalBottom, max(logicalTop, oldLogicalTop));
+                        }
                     }