https://bugs.webkit.org/show_bug.cgi?id=70622
Reviewed by Beth Dakin.
Source/WebCore:
Tests: fast/multicol/vertical-lr/rules-with-border-before.html
fast/multicol/vertical-rl/rules-with-border-before.html
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::paintColumnRules): Changed to use the physical left border and padding for the
left edge of the horizontal column rule.
LayoutTests:
* fast/multicol/vertical-lr/rules-with-border-before-expected.png: Added.
* fast/multicol/vertical-lr/rules-with-border-before-expected.txt: Added.
* fast/multicol/vertical-lr/rules-with-border-before.html: Added.
* fast/multicol/vertical-rl/rules-with-border-before-expected.png: Added.
* fast/multicol/vertical-rl/rules-with-border-before-expected.txt: Added.
* fast/multicol/vertical-rl/rules-with-border-before.html: Added.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@98115
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2011-10-21 Dan Bernstein <mitz@apple.com>
+
+ Column rules positioned incorrectly in vertical-rl block with horizontal border or padding
+ https://bugs.webkit.org/show_bug.cgi?id=70622
+
+ Reviewed by Beth Dakin.
+
+ * fast/multicol/vertical-lr/rules-with-border-before-expected.png: Added.
+ * fast/multicol/vertical-lr/rules-with-border-before-expected.txt: Added.
+ * fast/multicol/vertical-lr/rules-with-border-before.html: Added.
+ * fast/multicol/vertical-rl/rules-with-border-before-expected.png: Added.
+ * fast/multicol/vertical-rl/rules-with-border-before-expected.txt: Added.
+ * fast/multicol/vertical-rl/rules-with-border-before.html: Added.
+
2011-10-21 Elliot Poger <epoger@google.com>
re-enable layout tests against chromium-mac-snowleopard (Skia) baselines
--- /dev/null
+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
+layer at (8,8) size 150x100
+ RenderBlock {DIV} at (0,0) size 150x100 [border: (50px solid #0000FF)]
+ RenderBlock {DIV} at (50,0) size 200x25
+layer at (8,108) size 150x100
+ RenderBlock {DIV} at (0,100) size 150x100 [border: (50px solid #0000FF) none]
+ RenderBlock {DIV} at (0,0) size 200x25
--- /dev/null
+<style>
+ div.test {
+ -webkit-writing-mode: vertical-lr;
+ -webkit-columns: 2;
+ width: 100px;
+ -webkit-column-rule-style: solid;
+ -webkit-column-rule-width: 50px;
+ -webkit-column-rule-color: orange;
+ -webkit-column-gap: 50px;
+ height: 100px;
+ }
+
+ div.test div { width: 200px; }
+</style>
+<div class="test" style="-webkit-border-before: 50px solid blue;"><div></div></div>
+<div class="test" style="-webkit-border-after: 50px solid blue;"><div></div></div>
--- /dev/null
+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
+layer at (8,8) size 150x100
+ RenderBlock {DIV} at (0,0) size 150x100 [border: (50px solid #0000FF) none]
+ RenderBlock {DIV} at (50,0) size 200x25
+layer at (8,108) size 150x100
+ RenderBlock {DIV} at (0,100) size 150x100 [border: (50px solid #0000FF)]
+ RenderBlock {DIV} at (0,0) size 200x25
--- /dev/null
+<style>
+ div.test {
+ -webkit-writing-mode: vertical-rl;
+ -webkit-columns: 2;
+ width: 100px;
+ -webkit-column-rule-style: solid;
+ -webkit-column-rule-width: 50px;
+ -webkit-column-rule-color: orange;
+ -webkit-column-gap: 50px;
+ height: 100px;
+ }
+
+ div.test div { width: 200px; }
+</style>
+<div class="test" style="-webkit-border-before: 50px solid blue;"><div></div></div>
+<div class="test" style="-webkit-border-after: 50px solid blue;"><div></div></div>
+2011-10-21 Dan Bernstein <mitz@apple.com>
+
+ Column rules positioned incorrectly in vertical-rl block with horizontal border or padding
+ https://bugs.webkit.org/show_bug.cgi?id=70622
+
+ Reviewed by Beth Dakin.
+
+ Tests: fast/multicol/vertical-lr/rules-with-border-before.html
+ fast/multicol/vertical-rl/rules-with-border-before.html
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::paintColumnRules): Changed to use the physical left border and padding for the
+ left edge of the horizontal column rule.
+
2011-10-21 Simon Fraser <simon.fraser@apple.com>
Fix Windows build.
// Now paint the column rule.
if (i < colCount - 1) {
- LayoutUnit ruleLeft = isHorizontalWritingMode() ? paintOffset.x() + ruleLogicalLeft - ruleWidth / 2 + ruleAdd : paintOffset.x() + borderBefore() + paddingBefore();
+ LayoutUnit ruleLeft = isHorizontalWritingMode() ? paintOffset.x() + ruleLogicalLeft - ruleWidth / 2 + ruleAdd : paintOffset.x() + borderLeft() + paddingLeft();
LayoutUnit ruleRight = isHorizontalWritingMode() ? ruleLeft + ruleWidth : ruleLeft + contentWidth();
LayoutUnit ruleTop = isHorizontalWritingMode() ? paintOffset.y() + borderTop() + paddingTop() : paintOffset.y() + ruleLogicalLeft - ruleWidth / 2 + ruleAdd;
LayoutUnit ruleBottom = isHorizontalWritingMode() ? ruleTop + contentHeight() : ruleTop + ruleWidth;