Title: [142770] trunk
- Revision
- 142770
- Author
- [email protected]
- Date
- 2013-02-13 12:11:43 -0800 (Wed, 13 Feb 2013)
Log Message
WebKit ignores column-rules wider than column-gap
https://bugs.webkit.org/show_bug.cgi?id=15553
Paint column rules even if they are wider than the gap.
Rules wider than the gap should just overlap with column contents.
Patch by Morten Stenshorne <[email protected]> on 2013-02-13
Reviewed by Eric Seidel.
Source/WebCore:
Test: fast/multicol/rule-thicker-than-gap.html
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::paintColumnRules):
LayoutTests:
* fast/multicol/rule-thicker-than-gap-expected.html: Added.
* fast/multicol/rule-thicker-than-gap.html: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (142769 => 142770)
--- trunk/LayoutTests/ChangeLog 2013-02-13 20:08:11 UTC (rev 142769)
+++ trunk/LayoutTests/ChangeLog 2013-02-13 20:11:43 UTC (rev 142770)
@@ -1,3 +1,16 @@
+2013-02-13 Morten Stenshorne <[email protected]>
+
+ WebKit ignores column-rules wider than column-gap
+ https://bugs.webkit.org/show_bug.cgi?id=15553
+
+ Paint column rules even if they are wider than the gap.
+ Rules wider than the gap should just overlap with column contents.
+
+ Reviewed by Eric Seidel.
+
+ * fast/multicol/rule-thicker-than-gap-expected.html: Added.
+ * fast/multicol/rule-thicker-than-gap.html: Added.
+
2013-02-13 Philip Rogers <[email protected]>
Replace SVG bitmap cache with directly-rendered SVG
Added: trunk/LayoutTests/fast/multicol/rule-thicker-than-gap-expected.html (0 => 142770)
--- trunk/LayoutTests/fast/multicol/rule-thicker-than-gap-expected.html (rev 0)
+++ trunk/LayoutTests/fast/multicol/rule-thicker-than-gap-expected.html 2013-02-13 20:11:43 UTC (rev 142770)
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>Column rule thicker than gap</title>
+ <style>
+ .mc {
+ border-left: 31px solid;
+ margin-left: 35px;
+ height: 100px;
+ }
+ </style>
+ </head>
+ <body>
+ <p>There should be a filled rectangle below.</p>
+ <div class="mc"></div>
+ </body>
+</html>
Added: trunk/LayoutTests/fast/multicol/rule-thicker-than-gap.html (0 => 142770)
--- trunk/LayoutTests/fast/multicol/rule-thicker-than-gap.html (rev 0)
+++ trunk/LayoutTests/fast/multicol/rule-thicker-than-gap.html 2013-02-13 20:11:43 UTC (rev 142770)
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>Column rule thicker than gap</title>
+ <style>
+ .mc {
+ columns: 2;
+ column-gap: 15px;
+ column-rule: 31px solid;
+ -moz-columns: 2;
+ -moz-column-gap: 15px;
+ -moz-column-rule: 31px solid;
+ -webkit-columns: 2;
+ -webkit-column-gap: 15px;
+ -webkit-column-rule: 31px solid;
+ width: 101px;
+ }
+ </style>
+ </head>
+ <body>
+ <p>There should be a filled rectangle below.</p>
+ <div class="mc">
+ <div style="height:200px;"></div>
+ </div>
+ </body>
+</html>
Modified: trunk/Source/WebCore/ChangeLog (142769 => 142770)
--- trunk/Source/WebCore/ChangeLog 2013-02-13 20:08:11 UTC (rev 142769)
+++ trunk/Source/WebCore/ChangeLog 2013-02-13 20:11:43 UTC (rev 142770)
@@ -1,3 +1,18 @@
+2013-02-13 Morten Stenshorne <[email protected]>
+
+ WebKit ignores column-rules wider than column-gap
+ https://bugs.webkit.org/show_bug.cgi?id=15553
+
+ Paint column rules even if they are wider than the gap.
+ Rules wider than the gap should just overlap with column contents.
+
+ Reviewed by Eric Seidel.
+
+ Test: fast/multicol/rule-thicker-than-gap.html
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::paintColumnRules):
+
2013-02-13 Philip Rogers <[email protected]>
Replace SVG bitmap cache with directly-rendered SVG
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (142769 => 142770)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2013-02-13 20:08:11 UTC (rev 142769)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2013-02-13 20:11:43 UTC (rev 142770)
@@ -2805,7 +2805,7 @@
EBorderStyle ruleStyle = style()->columnRuleStyle();
LayoutUnit ruleThickness = style()->columnRuleWidth();
LayoutUnit colGap = columnGap();
- bool renderRule = ruleStyle > BHIDDEN && !ruleTransparent && ruleThickness <= colGap;
+ bool renderRule = ruleStyle > BHIDDEN && !ruleTransparent;
if (!renderRule)
return;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
