Changeset 97575 in webkit

Timestamp:

Oct 16, 2011 8:55:33 AM (13 years ago)

Author:

mitz@apple.com

Message:

REGRESSION (r96620): Float-avoiding block positioned incorrectly in right-to-left block
​https://bugs.webkit.org/show_bug.cgi?id=70197

Reviewed by Dave Kilzer.

Source/WebCore:

Test: fast/block/float/avoidance-rtl.html

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::computeStartPositionDeltaForChildAvoidingFloats): Changed
logicalLeftOffsetForContent() to startOffsetForContent() to get the right value in the
right-to-left case.

LayoutTests:

• fast/block/float/avoidance-rtl-expected.png: Added.
• fast/block/float/avoidance-rtl-expected.txt: Added.
• fast/block/float/avoidance-rtl.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/block/float/avoidance-rtl-expected.png (added)
• LayoutTests/fast/block/float/avoidance-rtl-expected.txt (added)
• LayoutTests/fast/block/float/avoidance-rtl.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-10-16  Dan Bernstein  <mitz@apple.com>
+
+        REGRESSION (r96620): Float-avoiding block positioned incorrectly in right-to-left block
+        https://bugs.webkit.org/show_bug.cgi?id=70197
+
+        Reviewed by Dave Kilzer.
+
+        * fast/block/float/avoidance-rtl-expected.png: Added.
+        * fast/block/float/avoidance-rtl-expected.txt: Added.
+        * fast/block/float/avoidance-rtl.html: Added.
+
 2011-10-16  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-16  Dan Bernstein  <mitz@apple.com>
+
+        REGRESSION (r96620): Float-avoiding block positioned incorrectly in right-to-left block
+        https://bugs.webkit.org/show_bug.cgi?id=70197
+
+        Reviewed by Dave Kilzer.
+
+        Test: fast/block/float/avoidance-rtl.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::computeStartPositionDeltaForChildAvoidingFloats): Changed
+        logicalLeftOffsetForContent() to startOffsetForContent() to get the right value in the
+        right-to-left case.
+
 2011-10-16  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -1813 +1813 @@
     LayoutUnit childLogicalWidth, RenderRegion* region, LayoutUnit offsetFromLogicalTopOfFirstPage)
 {
-    LayoutUnit startPosition = logicalLeftOffsetForContent(region, offsetFromLogicalTopOfFirstPage);
+    LayoutUnit startPosition = startOffsetForContent(region, offsetFromLogicalTopOfFirstPage);
 
     // Add in our start margin.