Changeset 97794 in webkit

Timestamp:

Oct 18, 2011, 3:14:00 PM (14 years ago)

Author:

mitz@apple.com

Message:

Certain column-rule styles render incorrectly in vertical writing modes
​https://bugs.webkit.org/show_bug.cgi?id=70362

Reviewed by Darin Adler.

Source/WebCore:

Test: fast/multicol/vertical-rl/rule-style.html

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::paintColumnRules): Use the correct border sides for vertical writing modes.

LayoutTests:

• fast/multicol/vertical-rl/rule-style-expected.png: Added.
• fast/multicol/vertical-rl/rule-style-expected.txt: Added.
• fast/multicol/vertical-rl/rule-style.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/multicol/vertical-rl/rule-style-expected.png (added)
• LayoutTests/fast/multicol/vertical-rl/rule-style-expected.txt (added)
• LayoutTests/fast/multicol/vertical-rl/rule-style.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-10-18  Dan Bernstein  <mitz@apple.com>
+
+        Certain column-rule styles render incorrectly in vertical writing modes
+        https://bugs.webkit.org/show_bug.cgi?id=70362
+
+        Reviewed by Darin Adler.
+
+        * fast/multicol/vertical-rl/rule-style-expected.png: Added.
+        * fast/multicol/vertical-rl/rule-style-expected.txt: Added.
+        * fast/multicol/vertical-rl/rule-style.html: Added.
+
 2011-10-18  Gavin Barraclough  <barraclough@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-18  Dan Bernstein  <mitz@apple.com>
+
+        Certain column-rule styles render incorrectly in vertical writing modes
+        https://bugs.webkit.org/show_bug.cgi?id=70362
+
+        Reviewed by Darin Adler.
+
+        Test: fast/multicol/vertical-rl/rule-style.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::paintColumnRules): Use the correct border sides for vertical writing modes.
+
 2011-10-18  Anna Cavender  <annacc@chromium.org>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -2417 +2417 @@
             LayoutUnit ruleTop = isHorizontalWritingMode() ? paintOffset.y() + borderTop() + paddingTop() : paintOffset.y() + ruleLogicalLeft - ruleWidth / 2 + ruleAdd;
             LayoutUnit ruleBottom = isHorizontalWritingMode() ? ruleTop + contentHeight() : ruleTop + ruleWidth;
-            drawLineForBoxSide(paintInfo.context, ruleLeft, ruleTop, ruleRight, ruleBottom,
-                               style()->isLeftToRightDirection() ? BSLeft : BSRight, ruleColor, ruleStyle, 0, 0, antialias);
+            BoxSide side = isHorizontalWritingMode()
+                ? style()->isLeftToRightDirection() ? BSLeft : BSRight
+                : style()->isLeftToRightDirection() ? BSTop : BSBottom;
+            drawLineForBoxSide(paintInfo.context, ruleLeft, ruleTop, ruleRight, ruleBottom, side, ruleColor, ruleStyle, 0, 0, antialias);
         }