Changeset 31213 in webkit

Timestamp:

Mar 21, 2008, 10:17:01 AM (17 years ago)

Author:

mitz@apple.com

Message:

WebCore:

Reviewed by Adele Peterson.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=17966 REGRESSION (r31114-r31132): Clearing via br behaves unpredictably

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

• rendering/bidi.cpp: (WebCore::RenderBlock::layoutInlineChildren): Fixed the logic for the very special case of an all-lines-clean block that ends with a float- clearing <br> by looking for the <br> at the end of the line rather than at its beginning.

LayoutTests:

Reviewed by Adele Peterson.

• test for ​http://bugs.webkit.org/show_bug.cgi?id=17966 REGRESSION (r31114-r31132): Clearing via br behaves unpredictably

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

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-03-21  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Adele Peterson.
+
+        - test for http://bugs.webkit.org/show_bug.cgi?id=17966
+          REGRESSION (r31114-r31132): Clearing via br behaves unpredictably
+
+        * fast/block/float/br-with-clear.html: Added.
+        * platform/mac/fast/block/float/br-with-clear-expected.checksum: Added.
+        * platform/mac/fast/block/float/br-with-clear-expected.png: Added.
+        * platform/mac/fast/block/float/br-with-clear-expected.txt: Added.
+
 2008-03-21  Dan Bernstein  <mitz@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-03-21  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Adele Peterson.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=17966
+          REGRESSION (r31114-r31132): Clearing via br behaves unpredictably
+
+        Test: fast/block/float/br-with-clear.html
+
+        * rendering/bidi.cpp:
+        (WebCore::RenderBlock::layoutInlineChildren): Fixed the logic for the
+        very special case of an all-lines-clean block that ends with a float-
+        clearing <br> by looking for the <br> at the end of the line rather
+        than at its beginning.
+
 2008-03-21  Adam Roben  <aroben@apple.com>
 

trunk/WebCore/rendering/bidi.cpp

@@ -870 +870 @@
         BidiIterator end = start.position();
 
-        if (!fullLayout && end.atEnd() && lastRootBox() && lastRootBox()->firstChild()->object()->isBR() && lastRootBox()->object()->firstChild()->style()->clear() != CNONE)
-            newLine(lastRootBox()->object()->firstChild()->style()->clear());
+        if (!fullLayout && end.atEnd() && lastRootBox() && lastRootBox()->lastChild()->object()->isBR() && lastRootBox()->object()->lastChild()->style()->clear() != CNONE)
+            newLine(lastRootBox()->object()->lastChild()->style()->clear());
 
         bool endLineMatched = false;