Changeset 31734 in webkit

Timestamp:

Apr 8, 2008, 1:58:36 PM (17 years ago)

Author:

mitz@apple.com

Message:

WebCore:

Reviewed by Antti Koivisto.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=18172 REGRESSION (r31114-31132): Page renders structured almost horizontally (at flickr.com)

Test: fast/block/float/br-with-clear-2.html

• rendering/bidi.cpp: (WebCore::RenderBlock::layoutInlineChildren): The existing code for handling a float-clearing <br> in incremental layout had several bugs in it: it only applied when the <br> was on the last line of the block; it assumed that the <br> was always the rightmost box on the line (which is false in right-to-left runs); and in some places it looked at the last child of the block instead of the last box on the line. Fixed these bugs.

LayoutTests:

Reviewed by Antti Koivisto.

• test for ​http://bugs.webkit.org/show_bug.cgi?id=18172 REGRESSION (r31114-31132): Page renders structured almost horizontally (at flickr.com)

• fast/block/float/br-with-clear-2.html: Added.
• platform/mac/fast/block/float/br-with-clear-2-expected.checksum: Added.
• platform/mac/fast/block/float/br-with-clear-2-expected.png: Added.
• platform/mac/fast/block/float/br-with-clear-2-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/block/float/br-with-clear-2.html (added)
• LayoutTests/platform/mac/fast/block/float/br-with-clear-2-expected.checksum (added)
• LayoutTests/platform/mac/fast/block/float/br-with-clear-2-expected.png (added)
• LayoutTests/platform/mac/fast/block/float/br-with-clear-2-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/bidi.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-04-08  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Antti Koivisto.
+
+        - test for http://bugs.webkit.org/show_bug.cgi?id=18172
+          REGRESSION (r31114-31132): Page renders structured almost horizontally (at flickr.com)
+
+        * fast/block/float/br-with-clear-2.html: Added.
+        * platform/mac/fast/block/float/br-with-clear-2-expected.checksum: Added.
+        * platform/mac/fast/block/float/br-with-clear-2-expected.png: Added.
+        * platform/mac/fast/block/float/br-with-clear-2-expected.txt: Added.
+
 2008-04-08  Brady Eidson  <beidson@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-04-08  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Antti Koivisto.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=18172
+          REGRESSION (r31114-31132): Page renders structured almost horizontally (at flickr.com)
+
+        Test: fast/block/float/br-with-clear-2.html
+
+        * rendering/bidi.cpp:
+        (WebCore::RenderBlock::layoutInlineChildren): The existing code for
+        handling a float-clearing <br> in incremental layout had several bugs in
+        it: it only applied when the <br> was on the last line of the block; it
+        assumed that the <br> was always the rightmost box on the line (which is
+        false in right-to-left runs); and in some places it looked at the last
+        child of the block instead of the last box on the line. Fixed these
+        bugs.
+
 2008-04-08  Adam Roben  <aroben@apple.com>
 

trunk/WebCore/rendering/bidi.cpp

@@ -870 +870 @@
         BidiIterator end = start.position();
 
-        if (!fullLayout && end.atEnd() && lastRootBox() && lastRootBox()->lastChild()->object()->isBR() && lastRootBox()->object()->lastChild()->style()->clear() != CNONE)
-            newLine(lastRootBox()->object()->lastChild()->style()->clear());
+        if (!fullLayout && lastRootBox() && lastRootBox()->endsWithBreak()) {
+            // If the last line before the start line ends with a line break that clear floats,
+            // adjust the height accordingly.
+            // A line break can be either the first or the last object on a line, depending on its direction.
+            RenderObject* lastObject = lastRootBox()->lastLeafChild()->object();
+            if (!lastObject->isBR())
+                lastObject = lastRootBox()->firstLeafChild()->object();
+            if (lastObject->isBR()) {
+                EClear clear = lastObject->style()->clear();
+                if (clear != CNONE)
+                    newLine(clear);
+            }
+        }
 
         bool endLineMatched = false;