Changeset 189916 in webkit
- Timestamp:
- Sep 17, 2015 10:03:27 AM (9 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r189915 r189916 1 2015-09-17 Zalan Bujtas <zalan@apple.com> 2 3 column-rule-style: outset/inset doesn't work 4 https://bugs.webkit.org/show_bug.cgi?id=148815 5 6 Reviewed by David Hyatt. 7 8 https://drafts.csswg.org/css-multicol-1/#crs 9 The <‘border-style’> values are interpreted as in the collapsing border model. 10 11 * TestExpectations: 12 1 13 2015-09-17 Alex Christensen <achristensen@webkit.org> 2 14 -
trunk/LayoutTests/TestExpectations
r189841 r189916 638 638 webkit.org/b/148818 imported/w3c/css/css-multicol-1/multicol-nested-column-rule-001.xht [ ImageOnlyFailure ] # only scrollbar 639 639 640 webkit.org/b/148811 imported/w3c/css/css-multicol-1/multicol-rule-inset-000.xht [ ImageOnlyFailure ]641 webkit.org/b/148811 imported/w3c/css/css-multicol-1/multicol-rule-outset-000.xht [ ImageOnlyFailure ]642 640 webkit.org/b/148812 imported/w3c/css/css-multicol-1/multicol-width-small-001.xht [ ImageOnlyFailure ] 643 641 webkit.org/b/148814 imported/w3c/css/css-multicol-1/multicol-break-000.xht [ ImageOnlyFailure ] 644 642 webkit.org/b/148814 imported/w3c/css/css-multicol-1/multicol-break-001.xht [ ImageOnlyFailure ] 645 webkit.org/b/148815 imported/w3c/css/css-multicol-1/multicol-rule-style-outset-001.xht [ ImageOnlyFailure ]646 webkit.org/b/148815 imported/w3c/css/css-multicol-1/multicol-rule-style-inset-001.xht [ ImageOnlyFailure ]647 643 webkit.org/b/148816 imported/w3c/css/css-multicol-1/multicol-rule-004.xht [ ImageOnlyFailure ] 648 644 webkit.org/b/148823 imported/w3c/css/css-multicol-1/multicol-span-all-margin-nested-003.xht [ ImageOnlyFailure ] -
trunk/Source/WebCore/ChangeLog
r189914 r189916 1 2015-09-17 Zalan Bujtas <zalan@apple.com> 2 3 column-rule-style: outset/inset doesn't work 4 https://bugs.webkit.org/show_bug.cgi?id=148815 5 <rdar://problem/22582644> 6 7 Reviewed by David Hyatt. 8 9 https://drafts.csswg.org/css-multicol-1/#crs 10 The <‘border-style’> values are interpreted as in the collapsing border model. 11 12 Unskipped 4 multicolumn tests, 13 14 * rendering/RenderMultiColumnSet.cpp: 15 (WebCore::RenderMultiColumnSet::paintColumnRules): 16 * rendering/RenderTableCell.cpp: 17 (WebCore::collapsedBorderStyle): Deleted. 18 * rendering/style/RenderStyle.h: 19 (WebCore::collapsedBorderStyle): 20 1 21 2015-09-17 Chris Dumez <cdumez@apple.com> 2 22 -
trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp
r189567 r189916 578 578 const Color& ruleColor = blockStyle.visitedDependentColor(CSSPropertyColumnRuleColor); 579 579 bool ruleTransparent = blockStyle.columnRuleIsTransparent(); 580 EBorderStyle ruleStyle = blockStyle.columnRuleStyle();580 EBorderStyle ruleStyle = collapsedBorderStyle(blockStyle.columnRuleStyle()); 581 581 LayoutUnit ruleThickness = blockStyle.columnRuleWidth(); 582 582 LayoutUnit colGap = columnGap(); -
trunk/Source/WebCore/rendering/RenderTableCell.cpp
r189144 r189916 1091 1091 } 1092 1092 1093 static EBorderStyle collapsedBorderStyle(EBorderStyle style)1094 {1095 if (style == OUTSET)1096 return GROOVE;1097 if (style == INSET)1098 return RIDGE;1099 return style;1100 }1101 1102 1093 struct CollapsedBorder { 1103 1094 CollapsedBorderValue borderValue; -
trunk/Source/WebCore/rendering/style/RenderStyle.h
r189830 r189916 2228 2228 } 2229 2229 2230 inline EBorderStyle collapsedBorderStyle(EBorderStyle style) 2231 { 2232 if (style == OUTSET) 2233 return GROOVE; 2234 if (style == INSET) 2235 return RIDGE; 2236 return style; 2237 } 2238 2230 2239 inline bool RenderStyle::setZoom(float f) 2231 2240 {
Note: See TracChangeset
for help on using the changeset viewer.