Changeset 96431 in webkit

Timestamp:

Sep 30, 2011 3:12:37 PM (13 years ago)

Author:

hyatt@apple.com

Message:

​https://bugs.webkit.org/show_bug.cgi?id=69173

RTL/LTR mixtures still not correct in regions. Simplify the loop once I realized it's only
your directionality that matters and not your containing block's.

Reviewed by Dan Bernstein.

Source/WebCore:

Added new test in fast/regions.

• rendering/RenderBox.cpp:

(WebCore::RenderBox::borderBoxRectInRegion):

LayoutTests:

• fast/regions/multiple-directionality-changes-in-variable-width-regions.html: Added.
• platform/mac/fast/regions/multiple-directionality-changes-in-variable-width-regions-expected.png: Added.
• platform/mac/fast/regions/multiple-directionality-changes-in-variable-width-regions-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/regions/multiple-directionality-changes-in-variable-width-regions.html (added)
• LayoutTests/platform/mac/fast/regions/multiple-directionality-changes-in-variable-width-regions-expected.png (added)
• LayoutTests/platform/mac/fast/regions/multiple-directionality-changes-in-variable-width-regions-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBox.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-09-30  David Hyatt  <hyatt@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=69173
+        
+        RTL/LTR mixtures still not correct in regions. Simplify the loop once I realized it's only
+        your directionality that matters and not your containing block's.
+
+        Reviewed by Dan Bernstein.
+
+        * fast/regions/multiple-directionality-changes-in-variable-width-regions.html: Added.
+        * platform/mac/fast/regions/multiple-directionality-changes-in-variable-width-regions-expected.png: Added.
+        * platform/mac/fast/regions/multiple-directionality-changes-in-variable-width-regions-expected.txt: Added.
+
 2011-09-30  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-30  David Hyatt  <hyatt@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=69173
+        
+        RTL/LTR mixtures still not correct in regions. Simplify the loop once I realized it's only
+        your directionality that matters and not your containing block's.
+
+        Reviewed by Dan Bernstein.
+
+        Added new test in fast/regions.
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::borderBoxRectInRegion):
+
 2011-09-30  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -216 +216 @@
     boxInfo = currentBox->renderBoxRegionInfo(region);
     while (boxInfo && boxInfo->isShifted()) {
-        RenderBox* containerBox = currentBox->containingBlock();
-        LayoutUnit widthDelta = currentBox->logicalWidth() - boxInfo->logicalWidth();
-        if (containerBox->style()->direction() == LTR) {
-            if (currentBox->style()->direction() == RTL)
-                logicalLeft -= widthDelta;
-            else
-                logicalLeft += boxInfo->logicalLeft();
-            
-        } else {
-            if (currentBox->style()->direction() == LTR)
-                logicalLeft += widthDelta;
-            else
-                logicalLeft -= widthDelta - boxInfo->logicalLeft();
-        }
-        currentBox = containerBox;
+        if (currentBox->style()->direction() == LTR)
+            logicalLeft += boxInfo->logicalLeft();
+        else
+            logicalLeft -= (currentBox->logicalWidth() - boxInfo->logicalWidth()) - boxInfo->logicalLeft();
+        currentBox = currentBox->containingBlock();
         boxInfo = currentBox->renderBoxRegionInfo(region);
     }