[webkit-changes] [98115] trunk

Fri, 21 Oct 2011 11:02:19 -0700

Title: [98115] trunk
Revision
98115
Author
m...@apple.com
Date
2011-10-21 11:03:16 -0700 (Fri, 21 Oct 2011)

Log Message

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.

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.

Modified Paths

Added Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (98114 => 98115)


--- trunk/LayoutTests/ChangeLog	2011-10-21 17:55:50 UTC (rev 98114)
+++ trunk/LayoutTests/ChangeLog	2011-10-21 18:03:16 UTC (rev 98115)
@@ -1,3 +1,17 @@
+2011-10-21  Dan Bernstein  <m...@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  <epo...@google.com>
 
         re-enable layout tests against chromium-mac-snowleopard (Skia) baselines

Added: trunk/LayoutTests/fast/multicol/vertical-lr/rules-with-border-before-expected.png


(Binary files differ)
Property changes on: trunk/LayoutTests/fast/multicol/vertical-lr/rules-with-border-before-expected.png ___________________________________________________________________

Added: svn:mime-type

Added: trunk/LayoutTests/fast/multicol/vertical-lr/rules-with-border-before-expected.txt (0 => 98115)


--- trunk/LayoutTests/fast/multicol/vertical-lr/rules-with-border-before-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/fast/multicol/vertical-lr/rules-with-border-before-expected.txt	2011-10-21 18:03:16 UTC (rev 98115)
@@ -0,0 +1,11 @@
+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

Added: trunk/LayoutTests/fast/multicol/vertical-lr/rules-with-border-before.html (0 => 98115)


--- trunk/LayoutTests/fast/multicol/vertical-lr/rules-with-border-before.html	                        (rev 0)
+++ trunk/LayoutTests/fast/multicol/vertical-lr/rules-with-border-before.html	2011-10-21 18:03:16 UTC (rev 98115)
@@ -0,0 +1,16 @@
+<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>

Added: trunk/LayoutTests/fast/multicol/vertical-rl/rules-with-border-before-expected.png


(Binary files differ)
Property changes on: trunk/LayoutTests/fast/multicol/vertical-rl/rules-with-border-before-expected.png ___________________________________________________________________

Added: svn:mime-type

Added: trunk/LayoutTests/fast/multicol/vertical-rl/rules-with-border-before-expected.txt (0 => 98115)


--- trunk/LayoutTests/fast/multicol/vertical-rl/rules-with-border-before-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/fast/multicol/vertical-rl/rules-with-border-before-expected.txt	2011-10-21 18:03:16 UTC (rev 98115)
@@ -0,0 +1,11 @@
+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

Added: trunk/LayoutTests/fast/multicol/vertical-rl/rules-with-border-before.html (0 => 98115)


--- trunk/LayoutTests/fast/multicol/vertical-rl/rules-with-border-before.html	                        (rev 0)
+++ trunk/LayoutTests/fast/multicol/vertical-rl/rules-with-border-before.html	2011-10-21 18:03:16 UTC (rev 98115)
@@ -0,0 +1,16 @@
+<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>

Modified: trunk/Source/WebCore/ChangeLog (98114 => 98115)


--- trunk/Source/WebCore/ChangeLog	2011-10-21 17:55:50 UTC (rev 98114)
+++ trunk/Source/WebCore/ChangeLog	2011-10-21 18:03:16 UTC (rev 98115)
@@ -1,3 +1,17 @@
+2011-10-21  Dan Bernstein  <m...@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.fra...@apple.com>
 
         Fix Windows build.

Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (98114 => 98115)


--- trunk/Source/WebCore/rendering/RenderBlock.cpp	2011-10-21 17:55:50 UTC (rev 98114)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp	2011-10-21 18:03:16 UTC (rev 98115)
@@ -2412,7 +2412,7 @@
        
         // 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;

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

Reply via email to