[webkit-changes] [97575] trunk

Sun, 16 Oct 2011 08:54:39 -0700

Title: [97575] trunk
Revision
97575
Author
m...@apple.com
Date
2011-10-16 08:55:33 -0700 (Sun, 16 Oct 2011)

Log 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.

Modified Paths

Added Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (97574 => 97575)


--- trunk/LayoutTests/ChangeLog	2011-10-16 10:28:50 UTC (rev 97574)
+++ trunk/LayoutTests/ChangeLog	2011-10-16 15:55:33 UTC (rev 97575)
@@ -1,3 +1,14 @@
+2011-10-16  Dan Bernstein  <m...@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  <aba...@webkit.org>
 
         Always enable ENABLE(DOM_STORAGE)

Added: trunk/LayoutTests/fast/block/float/avoidance-rtl-expected.png


(Binary files differ)
Property changes on: trunk/LayoutTests/fast/block/float/avoidance-rtl-expected.png ___________________________________________________________________

Added: svn:mime-type

Added: trunk/LayoutTests/fast/block/float/avoidance-rtl-expected.txt (0 => 97575)


--- trunk/LayoutTests/fast/block/float/avoidance-rtl-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/fast/block/float/avoidance-rtl-expected.txt	2011-10-16 15:55:33 UTC (rev 97575)
@@ -0,0 +1,9 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {DIV} at (0,0) size 250x100 [bgcolor=#FF0000] [border: (50px solid #008000)]
+        RenderBlock (floating) {DIV} at (150,0) size 100x100 [bgcolor=#008000]
+layer at (58,8) size 100x100
+  RenderBlock {DIV} at (50,0) size 100x100 [bgcolor=#008000]

Added: trunk/LayoutTests/fast/block/float/avoidance-rtl.html (0 => 97575)


--- trunk/LayoutTests/fast/block/float/avoidance-rtl.html	                        (rev 0)
+++ trunk/LayoutTests/fast/block/float/avoidance-rtl.html	2011-10-16 15:55:33 UTC (rev 97575)
@@ -0,0 +1,4 @@
+<div style="border-left: 50px solid green; direction: rtl; width: 200; background-color: red;">
+    <div style="background-color: green; width: 100px; height: 100px; float: right;"></div>
+    <div style="overflow: hidden; background-color: green; height: 100px; width: 100px;"></div>
+</div>

Modified: trunk/Source/WebCore/ChangeLog (97574 => 97575)


--- trunk/Source/WebCore/ChangeLog	2011-10-16 10:28:50 UTC (rev 97574)
+++ trunk/Source/WebCore/ChangeLog	2011-10-16 15:55:33 UTC (rev 97575)
@@ -1,3 +1,17 @@
+2011-10-16  Dan Bernstein  <m...@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  <aba...@webkit.org>
 
         Always enable ENABLE(DOM_STORAGE)

Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (97574 => 97575)


--- trunk/Source/WebCore/rendering/RenderBlock.cpp	2011-10-16 10:28:50 UTC (rev 97574)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp	2011-10-16 15:55:33 UTC (rev 97575)
@@ -1812,7 +1812,7 @@
 LayoutUnit RenderBlock::computeStartPositionDeltaForChildAvoidingFloats(const RenderBox* child, LayoutUnit childMarginStart,
     LayoutUnit childLogicalWidth, RenderRegion* region, LayoutUnit offsetFromLogicalTopOfFirstPage)
 {
-    LayoutUnit startPosition = logicalLeftOffsetForContent(region, offsetFromLogicalTopOfFirstPage);
+    LayoutUnit startPosition = startOffsetForContent(region, offsetFromLogicalTopOfFirstPage);
 
     // Add in our start margin.
     LayoutUnit oldPosition = startPosition + childMarginStart;

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to