Changeset 189916 in webkit


Ignore:
Timestamp:
Sep 17, 2015 10:03:27 AM (9 years ago)
Author:
Alan Bujtas
Message:

column-rule-style: outset/inset doesn't work
https://bugs.webkit.org/show_bug.cgi?id=148815
Source/WebCore:

<rdar://problem/22582644>

Reviewed by David Hyatt.

https://drafts.csswg.org/css-multicol-1/#crs
The <‘border-style’> values are interpreted as in the collapsing border model.

Unskipped 4 multicolumn tests,

  • rendering/RenderMultiColumnSet.cpp:

(WebCore::RenderMultiColumnSet::paintColumnRules):

  • rendering/RenderTableCell.cpp:

(WebCore::collapsedBorderStyle): Deleted.

  • rendering/style/RenderStyle.h:

(WebCore::collapsedBorderStyle):

LayoutTests:

Reviewed by David Hyatt.

https://drafts.csswg.org/css-multicol-1/#crs
The <‘border-style’> values are interpreted as in the collapsing border model.

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r189915 r189916  
     12015-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
    1132015-09-17  Alex Christensen  <achristensen@webkit.org>
    214
  • trunk/LayoutTests/TestExpectations

    r189841 r189916  
    638638webkit.org/b/148818 imported/w3c/css/css-multicol-1/multicol-nested-column-rule-001.xht [ ImageOnlyFailure ] # only scrollbar
    639639
    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 ]
    642640webkit.org/b/148812 imported/w3c/css/css-multicol-1/multicol-width-small-001.xht [ ImageOnlyFailure ]
    643641webkit.org/b/148814 imported/w3c/css/css-multicol-1/multicol-break-000.xht [ ImageOnlyFailure ]
    644642webkit.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 ]
    647643webkit.org/b/148816 imported/w3c/css/css-multicol-1/multicol-rule-004.xht [ ImageOnlyFailure ]
    648644webkit.org/b/148823 imported/w3c/css/css-multicol-1/multicol-span-all-margin-nested-003.xht [ ImageOnlyFailure ]
  • trunk/Source/WebCore/ChangeLog

    r189914 r189916  
     12015-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
    1212015-09-17  Chris Dumez  <cdumez@apple.com>
    222
  • trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp

    r189567 r189916  
    578578    const Color& ruleColor = blockStyle.visitedDependentColor(CSSPropertyColumnRuleColor);
    579579    bool ruleTransparent = blockStyle.columnRuleIsTransparent();
    580     EBorderStyle ruleStyle = blockStyle.columnRuleStyle();
     580    EBorderStyle ruleStyle = collapsedBorderStyle(blockStyle.columnRuleStyle());
    581581    LayoutUnit ruleThickness = blockStyle.columnRuleWidth();
    582582    LayoutUnit colGap = columnGap();
  • trunk/Source/WebCore/rendering/RenderTableCell.cpp

    r189144 r189916  
    10911091}
    10921092
    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 
    11021093struct CollapsedBorder {
    11031094    CollapsedBorderValue borderValue;
  • trunk/Source/WebCore/rendering/style/RenderStyle.h

    r189830 r189916  
    22282228}
    22292229
     2230inline EBorderStyle collapsedBorderStyle(EBorderStyle style)
     2231{
     2232    if (style == OUTSET)
     2233        return GROOVE;
     2234    if (style == INSET)
     2235        return RIDGE;
     2236    return style;
     2237}
     2238
    22302239inline bool RenderStyle::setZoom(float f)
    22312240{
Note: See TracChangeset for help on using the changeset viewer.