Changeset 175421 in webkit


Ignore:
Timestamp:
Oct 31, 2014 1:42:45 PM (10 years ago)
Author:
dino@apple.com
Message:

Remove webkit prefix from CSS columns.
​https://bugs.webkit.org/show_bug.cgi?id=137132.

Patch by Said Abou-Hallawa <​sabouhallawa@apple.com> on 2014-10-31
Reviewed by Dean Jackson.

LayoutTests/imported/w3c:

Import tests for basic multi-column properties settings. They are approved by W3C and
pass the WebKit testing. More tests need to be imported when they are approved.

  • css: Added.
  • css/multicol: Added.
  • css/multicol/multicol-basic-001-expected.html: Added.
  • css/multicol/multicol-basic-001.html: Added.
  • css/multicol/multicol-basic-002-expected.html: Added.
  • css/multicol/multicol-basic-002.html: Added.
  • css/multicol/multicol-basic-003-expected.html: Added.
  • css/multicol/multicol-basic-003.html: Added.
  • css/multicol/multicol-basic-004-expected.html: Added.
  • css/multicol/multicol-basic-004.html: Added.

Source/WebCore:

CSS columns properties are ready for un-prefixing. There are still a couple
that we haven't implemented, such as the ones starting with "break-", so we're
just going to do the ones starting with "column-". The list of column un-
prefixed properties in this change set is:

  • column-count
  • column-fill
  • column-gap
  • column-progression
  • column-rule
  • column-rule-color
  • column-rule-style
  • column-rule-width
  • column-span
  • column-width
  • columns

Tests: fast/multicol/column-box-alignment-rtl.html

fast/multicol/multicol-aliases.html
imported/w3c/css/multicol/multicol-basic-001.html
imported/w3c/css/multicol/multicol-basic-002.html
imported/w3c/css/multicol/multicol-basic-003.html
imported/w3c/css/multicol/multicol-basic-004.html

Add new un-prefixed column properties and make the -webkit* ones be aliases
to the new ones.

  • css/CSSPropertyNames.in:

Use the new enums CSSPropertyColumn* instead of the prefixed ones.

  • css/CSSComputedStyleDeclaration.cpp:

(WebCore::ComputedStyleExtractor::propertyValue):

  • css/CSSParser.cpp:

(WebCore::isColorPropertyID):
(WebCore::isValidKeywordPropertyAndValue):
(WebCore::isKeywordPropertyID):
(WebCore::CSSParser::parseValue):

  • css/DeprecatedStyleBuilder.cpp:

(WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):

  • css/StyleProperties.cpp:

(WebCore::StyleProperties::getPropertyValue):

  • css/StylePropertyShorthand.cpp:

(WebCore::webkitColumnsShorthand):
(WebCore::webkitColumnRuleShorthand):
(WebCore::shorthandForProperty):
(WebCore::matchingShorthandsForLonghand):

  • css/StyleResolver.cpp:

(WebCore::isValidVisitedLinkProperty):
(WebCore::StyleResolver::applyProperty):

  • page/animation/CSSPropertyAnimation.cpp:

(WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):

  • rendering/RenderMultiColumnSet.cpp:

(WebCore::RenderMultiColumnSet::paintColumnRules):

  • rendering/style/RenderStyle.cpp:

(WebCore::RenderStyle::colorIncludingFallback):

LayoutTests:

Ensure the CSS un-prefixed column properties are behaving the same way as the
prefixed ones. The CSS prefixed column properties are still supported by making
them aliases of the un-prefixed ones. Also port some of the W3C and Mozilla
tests for css column properties tests.

Change to the un-prefixed column names to be compared with the return of CSSStyleDeclaration.item().
And change the expected names to be the un-prefixed ones also.

  • fast/css/getComputedStyle/computed-style-expected.txt:
  • fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
  • fast/css/getComputedStyle/resources/property-names.js:

Change to the un-prefixed column names and compare them with the return of object.style.cssText().

  • fast/css/remove-shorthand-expected.txt:

Test for the effect of the rtl settings on column flow; it is ported from Mozilla.

  • fast/multicol/column-box-alignment-rtl-expected.html: Added.
  • fast/multicol/column-box-alignment-rtl.html: Added.

Ensure the prefixed and the un-prefixed column properties are behaving exactly the same.

  • fast/multicol/multicol-aliases-expected.html: Added.
  • fast/multicol/multicol-aliases.html: Added.

Change to the un-prefixed column names to be compared with the return of CSSStyleDeclaration.item().

  • svg/css/getComputedStyle-basic-expected.txt:

Remove the use of the un-prefixed columns property since it seems unrelated to the test.

  • svg/custom/svg-fonts-in-html.html:
Location:
trunk
Files:
14 added
19 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r175412 r175421  
     12014-10-31  Said Abou-Hallawa  <sabouhallawa@apple.com>
     2
     3        Remove webkit prefix from CSS columns.
     4        https://bugs.webkit.org/show_bug.cgi?id=137132.
     5
     6        Reviewed by Dean Jackson.
     7
     8        Ensure the CSS un-prefixed column properties are behaving the same way as the
     9        prefixed ones. The CSS prefixed column properties are still supported by making
     10        them aliases of the un-prefixed ones.  Also port some of the W3C and Mozilla
     11        tests for css column properties tests.
     12
     13        Change to the un-prefixed column names to be compared with the return of CSSStyleDeclaration.item().
     14        And change the expected names to be the un-prefixed ones also.
     15        * fast/css/getComputedStyle/computed-style-expected.txt:
     16        * fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
     17        * fast/css/getComputedStyle/resources/property-names.js:
     18
     19        Change to the un-prefixed column names and compare them with the return of object.style.cssText().
     20        * fast/css/remove-shorthand-expected.txt:
     21
     22        Test for the effect of the rtl settings on column flow; it is ported from Mozilla.
     23        * fast/multicol/column-box-alignment-rtl-expected.html: Added.
     24        * fast/multicol/column-box-alignment-rtl.html: Added.
     25
     26        Ensure the prefixed and the un-prefixed column properties are behaving exactly the same.
     27        * fast/multicol/multicol-aliases-expected.html: Added.
     28        * fast/multicol/multicol-aliases.html: Added.
     29
     30        Change to the un-prefixed column names to be compared with the return of CSSStyleDeclaration.item().
     31        * svg/css/getComputedStyle-basic-expected.txt:
     32
     33        Remove the use of the un-prefixed columns property since it seems unrelated to the test.
     34        * svg/custom/svg-fonts-in-html.html:
     35
    1362014-10-31  Eric Carlson  <eric.carlson@apple.com>
    237

  • trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt

    r173572 r175421  
    137137-webkit-column-break-inside: auto;
    138138-webkit-column-axis: auto;
    139 -webkit-column-count: auto;
    140 -webkit-column-gap: normal;
    141 -webkit-column-rule-color: rgb(0, 0, 0);
    142 -webkit-column-rule-style: none;
    143 -webkit-column-rule-width: 0px;
    144 -webkit-column-span: none;
    145 -webkit-column-width: auto;
     139column-count: auto;
     140column-gap: normal;
     141column-rule-color: rgb(0, 0, 0);
     142column-rule-style: none;
     143column-rule-width: 0px;
     144column-span: none;
     145column-width: auto;
    146146align-content: stretch;
    147147align-items: stretch;

  • trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt

    r173572 r175421  
    136136-webkit-column-break-inside: auto
    137137-webkit-column-axis: auto
    138 -webkit-column-count: auto
    139 -webkit-column-gap: normal
    140 -webkit-column-rule-color: rgb(0, 0, 0)
    141 -webkit-column-rule-style: none
    142 -webkit-column-rule-width: 0px
    143 -webkit-column-span: none
    144 -webkit-column-width: auto
     138column-count: auto
     139column-gap: normal
     140column-rule-color: rgb(0, 0, 0)
     141column-rule-style: none
     142column-rule-width: 0px
     143column-span: none
     144column-width: auto
    145145align-content: stretch
    146146align-items: stretch

  • trunk/LayoutTests/fast/css/getComputedStyle/resources/property-names.js

    r173572 r175421  
    3838    "-webkit-column-break-before": true,
    3939    "-webkit-column-break-inside": true,
    40     "-webkit-column-count": true,
    41     "-webkit-column-gap": true,
    42     "-webkit-column-rule-color": true,
    43     "-webkit-column-rule-style": true,
    44     "-webkit-column-rule-width": true,
    45     "-webkit-column-span": true,
    46     "-webkit-column-width": true,
     40    "column-count": true,
     41    "column-gap": true,
     42    "column-rule-color": true,
     43    "column-rule-style": true,
     44    "column-rule-width": true,
     45    "column-span": true,
     46    "column-width": true,
    4747    "flex-direction": true,
    4848    "flex-wrap": true,

  • trunk/LayoutTests/fast/css/remove-shorthand-expected.txt

    r115227 r175421  
    4343and adds "".
    4444Removing -webkit-columns
    45 removes "-webkit-column-width, -webkit-column-count"
     45removes "column-width, column-count"
    4646and adds "".
    4747Removing -webkit-column-rule
    48 removes "-webkit-column-rule-width, -webkit-column-rule-style, -webkit-column-rule-color"
     48removes "column-rule-width, column-rule-style, column-rule-color"
    4949and adds "".
    5050Removing list-style

  • trunk/LayoutTests/imported/w3c/ChangeLog

    r160037 r175421  
     12014-10-31  Said Abou-Hallawa  <sabouhallawa@apple.com>
     2
     3        Remove webkit prefix from CSS columns.
     4        https://bugs.webkit.org/show_bug.cgi?id=137132.
     5
     6        Reviewed by Dean Jackson.
     7
     8        Import tests for basic multi-column properties settings. They are approved by W3C and
     9        pass the WebKit testing. More tests need to be imported when they are approved.
     10
     11        * css: Added.
     12        * css/multicol: Added.
     13        * css/multicol/multicol-basic-001-expected.html: Added.
     14        * css/multicol/multicol-basic-001.html: Added.
     15        * css/multicol/multicol-basic-002-expected.html: Added.
     16        * css/multicol/multicol-basic-002.html: Added.
     17        * css/multicol/multicol-basic-003-expected.html: Added.
     18        * css/multicol/multicol-basic-003.html: Added.
     19        * css/multicol/multicol-basic-004-expected.html: Added.
     20        * css/multicol/multicol-basic-004.html: Added.
     21
    1222013-12-03  Ryosuke Niwa  <rniwa@webkit.org>
    223

  • trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt

    r173572 r175421  
    271271rect: style.getPropertyValue(-webkit-column-axis) : auto
    272272rect: style.getPropertyCSSValue(-webkit-column-axis) : [object CSSPrimitiveValue]
    273 rect: style.getPropertyValue(-webkit-column-count) : auto
    274 rect: style.getPropertyCSSValue(-webkit-column-count) : [object CSSPrimitiveValue]
    275 rect: style.getPropertyValue(-webkit-column-gap) : normal
    276 rect: style.getPropertyCSSValue(-webkit-column-gap) : [object CSSPrimitiveValue]
    277 rect: style.getPropertyValue(-webkit-column-rule-color) : rgb(0, 0, 0)
    278 rect: style.getPropertyCSSValue(-webkit-column-rule-color) : [object CSSPrimitiveValue]
    279 rect: style.getPropertyValue(-webkit-column-rule-style) : none
    280 rect: style.getPropertyCSSValue(-webkit-column-rule-style) : [object CSSPrimitiveValue]
    281 rect: style.getPropertyValue(-webkit-column-rule-width) : 0px
    282 rect: style.getPropertyCSSValue(-webkit-column-rule-width) : [object CSSPrimitiveValue]
    283 rect: style.getPropertyValue(-webkit-column-span) : none
    284 rect: style.getPropertyCSSValue(-webkit-column-span) : [object CSSPrimitiveValue]
    285 rect: style.getPropertyValue(-webkit-column-width) : auto
    286 rect: style.getPropertyCSSValue(-webkit-column-width) : [object CSSPrimitiveValue]
     273rect: style.getPropertyValue(column-count) : auto
     274rect: style.getPropertyCSSValue(column-count) : [object CSSPrimitiveValue]
     275rect: style.getPropertyValue(column-gap) : normal
     276rect: style.getPropertyCSSValue(column-gap) : [object CSSPrimitiveValue]
     277rect: style.getPropertyValue(column-rule-color) : rgb(0, 0, 0)
     278rect: style.getPropertyCSSValue(column-rule-color) : [object CSSPrimitiveValue]
     279rect: style.getPropertyValue(column-rule-style) : none
     280rect: style.getPropertyCSSValue(column-rule-style) : [object CSSPrimitiveValue]
     281rect: style.getPropertyValue(column-rule-width) : 0px
     282rect: style.getPropertyCSSValue(column-rule-width) : [object CSSPrimitiveValue]
     283rect: style.getPropertyValue(column-span) : none
     284rect: style.getPropertyCSSValue(column-span) : [object CSSPrimitiveValue]
     285rect: style.getPropertyValue(column-width) : auto
     286rect: style.getPropertyCSSValue(column-width) : [object CSSPrimitiveValue]
    287287rect: style.getPropertyValue(align-content) : stretch
    288288rect: style.getPropertyCSSValue(align-content) : [object CSSPrimitiveValue]
    … …  
    783783g: style.getPropertyValue(-webkit-column-axis) : auto
    784784g: style.getPropertyCSSValue(-webkit-column-axis) : [object CSSPrimitiveValue]
    785 g: style.getPropertyValue(-webkit-column-count) : auto
    786 g: style.getPropertyCSSValue(-webkit-column-count) : [object CSSPrimitiveValue]
    787 g: style.getPropertyValue(-webkit-column-gap) : normal
    788 g: style.getPropertyCSSValue(-webkit-column-gap) : [object CSSPrimitiveValue]
    789 g: style.getPropertyValue(-webkit-column-rule-color) : rgb(0, 0, 0)
    790 g: style.getPropertyCSSValue(-webkit-column-rule-color) : [object CSSPrimitiveValue]
    791 g: style.getPropertyValue(-webkit-column-rule-style) : none
    792 g: style.getPropertyCSSValue(-webkit-column-rule-style) : [object CSSPrimitiveValue]
    793 g: style.getPropertyValue(-webkit-column-rule-width) : 0px
    794 g: style.getPropertyCSSValue(-webkit-column-rule-width) : [object CSSPrimitiveValue]
    795 g: style.getPropertyValue(-webkit-column-span) : none
    796 g: style.getPropertyCSSValue(-webkit-column-span) : [object CSSPrimitiveValue]
    797 g: style.getPropertyValue(-webkit-column-width) : auto
    798 g: style.getPropertyCSSValue(-webkit-column-width) : [object CSSPrimitiveValue]
     785g: style.getPropertyValue(column-count) : auto
     786g: style.getPropertyCSSValue(column-count) : [object CSSPrimitiveValue]
     787g: style.getPropertyValue(column-gap) : normal
     788g: style.getPropertyCSSValue(column-gap) : [object CSSPrimitiveValue]
     789g: style.getPropertyValue(column-rule-color) : rgb(0, 0, 0)
     790g: style.getPropertyCSSValue(column-rule-color) : [object CSSPrimitiveValue]
     791g: style.getPropertyValue(column-rule-style) : none
     792g: style.getPropertyCSSValue(column-rule-style) : [object CSSPrimitiveValue]
     793g: style.getPropertyValue(column-rule-width) : 0px
     794g: style.getPropertyCSSValue(column-rule-width) : [object CSSPrimitiveValue]
     795g: style.getPropertyValue(column-span) : none
     796g: style.getPropertyCSSValue(column-span) : [object CSSPrimitiveValue]
     797g: style.getPropertyValue(column-width) : auto
     798g: style.getPropertyCSSValue(column-width) : [object CSSPrimitiveValue]
    799799g: style.getPropertyValue(align-content) : stretch
    800800g: style.getPropertyCSSValue(align-content) : [object CSSPrimitiveValue]

  • trunk/LayoutTests/svg/custom/svg-fonts-in-html.html

    r101858 r175421  
    7979       
    8080        #quickSummary, #supportingText, #linkList { display: none }
    81        
    82         #preamble { columns: 2 }
    8381    </style>
    8482   

  • trunk/Source/WebCore/ChangeLog

    r175417 r175421  
     12014-10-31  Said Abou-Hallawa  <sabouhallawa@apple.com>
     2
     3        Remove webkit prefix from CSS columns.
     4        https://bugs.webkit.org/show_bug.cgi?id=137132.
     5
     6        Reviewed by Dean Jackson.
     7
     8        CSS columns properties are ready for un-prefixing. There are still a couple
     9        that we haven't implemented, such as the ones starting with "break-", so we're
     10        just going to do the ones starting with "column-".  The list of column un-
     11        prefixed properties in this change set is:
     12            - column-count
     13            - column-fill
     14            - column-gap
     15            - column-progression
     16            - column-rule
     17            - column-rule-color
     18            - column-rule-style
     19            - column-rule-width
     20            - column-span
     21            - column-width
     22            - columns
     23
     24        Tests: fast/multicol/column-box-alignment-rtl.html
     25               fast/multicol/multicol-aliases.html
     26               imported/w3c/css/multicol/multicol-basic-001.html
     27               imported/w3c/css/multicol/multicol-basic-002.html
     28               imported/w3c/css/multicol/multicol-basic-003.html
     29               imported/w3c/css/multicol/multicol-basic-004.html
     30
     31        Add new un-prefixed column properties and make the -webkit* ones be aliases
     32        to the new ones.
     33        * css/CSSPropertyNames.in:
     34
     35        Use the new enums CSSPropertyColumn* instead of the prefixed ones.
     36        * css/CSSComputedStyleDeclaration.cpp:
     37        (WebCore::ComputedStyleExtractor::propertyValue):
     38        * css/CSSParser.cpp:
     39        (WebCore::isColorPropertyID):
     40        (WebCore::isValidKeywordPropertyAndValue):
     41        (WebCore::isKeywordPropertyID):
     42        (WebCore::CSSParser::parseValue):
     43        * css/DeprecatedStyleBuilder.cpp:
     44        (WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
     45        * css/StyleProperties.cpp:
     46        (WebCore::StyleProperties::getPropertyValue):
     47        * css/StylePropertyShorthand.cpp:
     48        (WebCore::webkitColumnsShorthand):
     49        (WebCore::webkitColumnRuleShorthand):
     50        (WebCore::shorthandForProperty):
     51        (WebCore::matchingShorthandsForLonghand):
     52        * css/StyleResolver.cpp:
     53        (WebCore::isValidVisitedLinkProperty):
     54        (WebCore::StyleResolver::applyProperty):
     55        * page/animation/CSSPropertyAnimation.cpp:
     56        (WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):
     57        * rendering/RenderMultiColumnSet.cpp:
     58        (WebCore::RenderMultiColumnSet::paintColumnRules):
     59        * rendering/style/RenderStyle.cpp:
     60        (WebCore::RenderStyle::colorIncludingFallback):
     61
    1622014-10-31  Tim Horton  <timothy_horton@apple.com>
    263

  • trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

    r174840 r175421  
    267267    CSSPropertyWebkitColumnBreakInside,
    268268    CSSPropertyWebkitColumnAxis,
    269     CSSPropertyWebkitColumnCount,
    270     CSSPropertyWebkitColumnGap,
    271     CSSPropertyWebkitColumnProgression,
    272     CSSPropertyWebkitColumnRuleColor,
    273     CSSPropertyWebkitColumnRuleStyle,
    274     CSSPropertyWebkitColumnRuleWidth,
    275     CSSPropertyWebkitColumnSpan,
    276     CSSPropertyWebkitColumnWidth,
     269    CSSPropertyColumnCount,
     270    CSSPropertyColumnGap,
     271    CSSPropertyColumnProgression,
     272    CSSPropertyColumnRuleColor,
     273    CSSPropertyColumnRuleStyle,
     274    CSSPropertyColumnRuleWidth,
     275    CSSPropertyColumnSpan,
     276    CSSPropertyColumnWidth,
    277277#if ENABLE(CURSOR_VISIBILITY)
    278278    CSSPropertyWebkitCursorVisibility,
    … …  
    19751975        case CSSPropertyWebkitColumnAxis:
    19761976            return cssValuePool().createValue(style->columnAxis());
    1977         case CSSPropertyWebkitColumnCount:
     1977        case CSSPropertyColumnCount:
    19781978            if (style->hasAutoColumnCount())
    19791979                return cssValuePool().createIdentifierValue(CSSValueAuto);
    19801980            return cssValuePool().createValue(style->columnCount(), CSSPrimitiveValue::CSS_NUMBER);
    1981         case CSSPropertyWebkitColumnFill:
     1981        case CSSPropertyColumnFill:
    19821982            return cssValuePool().createValue(style->columnFill());
    1983         case CSSPropertyWebkitColumnGap:
     1983        case CSSPropertyColumnGap:
    19841984            if (style->hasNormalColumnGap())
    19851985                return cssValuePool().createIdentifierValue(CSSValueNormal);
    19861986            return zoomAdjustedPixelValue(style->columnGap(), style.get());
    1987         case CSSPropertyWebkitColumnProgression:
     1987        case CSSPropertyColumnProgression:
    19881988            return cssValuePool().createValue(style->columnProgression());
    1989         case CSSPropertyWebkitColumnRuleColor:
     1989        case CSSPropertyColumnRuleColor:
    19901990            return m_allowVisitedStyle ? cssValuePool().createColorValue(style->visitedDependentColor(CSSPropertyOutlineColor).rgb()) : currentColorOrValidColor(style.get(), style->columnRuleColor());
    1991         case CSSPropertyWebkitColumnRuleStyle:
     1991        case CSSPropertyColumnRuleStyle:
    19921992            return cssValuePool().createValue(style->columnRuleStyle());
    1993         case CSSPropertyWebkitColumnRuleWidth:
     1993        case CSSPropertyColumnRuleWidth:
    19941994            return zoomAdjustedPixelValue(style->columnRuleWidth(), style.get());
    1995         case CSSPropertyWebkitColumnSpan:
     1995        case CSSPropertyColumnSpan:
    19961996            return cssValuePool().createIdentifierValue(style->columnSpan() ? CSSValueAll : CSSValueNone);
    19971997        case CSSPropertyWebkitColumnBreakAfter:
    … …  
    20012001        case CSSPropertyWebkitColumnBreakInside:
    20022002            return cssValuePool().createValue(style->columnBreakInside());
    2003         case CSSPropertyWebkitColumnWidth:
     2003        case CSSPropertyColumnWidth:
    20042004            if (style->hasAutoColumnWidth())
    20052005                return cssValuePool().createIdentifierValue(CSSValueAuto);
    … …  
    29382938        case CSSPropertyBorderWidth:
    29392939            return getCSSPropertyValuesForSidesShorthand(borderWidthShorthand());
    2940         case CSSPropertyWebkitColumnRule:
     2940        case CSSPropertyColumnRule:
    29412941            return getCSSPropertyValuesForShorthandProperties(webkitColumnRuleShorthand());
    2942         case CSSPropertyWebkitColumns:
     2942        case CSSPropertyColumns:
    29432943            return getCSSPropertyValuesForShorthandProperties(webkitColumnsShorthand());
    29442944        case CSSPropertyListStyle:

  • trunk/Source/WebCore/css/CSSParser.cpp

    r174999 r175421  
    491491    case CSSPropertyWebkitBorderEndColor:
    492492    case CSSPropertyWebkitBorderStartColor:
    493     case CSSPropertyWebkitColumnRuleColor:
     493    case CSSPropertyColumnRuleColor:
    494494    case CSSPropertyWebkitTextDecorationColor:
    495495    case CSSPropertyWebkitTextEmphasisColor:
    … …  
    653653    case CSSPropertyWebkitBorderEndStyle:
    654654    case CSSPropertyWebkitBorderStartStyle:
    655     case CSSPropertyWebkitColumnRuleStyle:
     655    case CSSPropertyColumnRuleStyle:
    656656        if (valueID >= CSSValueNone && valueID <= CSSValueDouble)
    657657            return true;
    … …  
    857857            return true;
    858858        break;
    859     case CSSPropertyWebkitColumnFill:
     859    case CSSPropertyColumnFill:
    860860        if (valueID == CSSValueAuto || valueID == CSSValueBalance)
    861861            return true;
    … …  
    11041104    case CSSPropertyWebkitColumnBreakBefore:
    11051105    case CSSPropertyWebkitColumnBreakInside:
    1106     case CSSPropertyWebkitColumnFill:
    1107     case CSSPropertyWebkitColumnRuleStyle:
     1106    case CSSPropertyColumnFill:
     1107    case CSSPropertyColumnRuleStyle:
    11081108    case CSSPropertyAlignContent:
    11091109    case CSSPropertyAlignItems:
    … …  
    19551955    case CSSPropertyTextUnderlineColor:
    19561956    case CSSPropertyTextOverlineColor:
    1957     case CSSPropertyWebkitColumnRuleColor:
     1957    case CSSPropertyColumnRuleColor:
    19581958    case CSSPropertyWebkitTextDecorationColor:
    19591959    case CSSPropertyWebkitTextEmphasisColor:
    … …  
    21422142    case CSSPropertyWebkitBorderBeforeWidth:
    21432143    case CSSPropertyWebkitBorderAfterWidth:
    2144     case CSSPropertyWebkitColumnRuleWidth:
     2144    case CSSPropertyColumnRuleWidth:
    21452145        if (id == CSSValueThin || id == CSSValueMedium || id == CSSValueThick)
    21462146            validPrimitive = true;
    … …  
    26842684            validPrimitive = !id && validUnit(value, FNumber | FLength | FPercent);
    26852685        break;
    2686     case CSSPropertyWebkitColumnCount:
     2686    case CSSPropertyColumnCount:
    26872687        if (id == CSSValueAuto)
    26882688            validPrimitive = true;
    … …  
    26902690            validPrimitive = !id && validUnit(value, FPositiveInteger, CSSQuirksMode);
    26912691        break;
    2692     case CSSPropertyWebkitColumnGap:        // normal | <length>
     2692    case CSSPropertyColumnGap: // normal | <length>
    26932693        if (id == CSSValueNormal)
    26942694            validPrimitive = true;
    … …  
    27002700            validPrimitive = true;
    27012701        break;
    2702     case CSSPropertyWebkitColumnProgression:
     2702    case CSSPropertyColumnProgression:
    27032703        if (id == CSSValueNormal || id == CSSValueReverse)
    27042704            validPrimitive = true;
    27052705        break;
    2706     case CSSPropertyWebkitColumnSpan: // none | all | 1 (will be dropped in the unprefixed property)
     2706    case CSSPropertyColumnSpan: // none | all | 1 (will be dropped in the unprefixed property)
    27072707        if (id == CSSValueAll || id == CSSValueNone)
    27082708            validPrimitive = true;
    … …  
    27102710            validPrimitive = validUnit(value, FNumber | FNonNeg) && value->fValue == 1;
    27112711        break;
    2712     case CSSPropertyWebkitColumnWidth:        // auto | <length>
     2712    case CSSPropertyColumnWidth: // auto | <length>
    27132713        if (id == CSSValueAuto)
    27142714            validPrimitive = true;
    … …  
    28742874    case CSSPropertyListStyle:
    28752875        return parseShorthand(propId, listStyleShorthand(), important);
    2876     case CSSPropertyWebkitColumns:
     2876    case CSSPropertyColumns:
    28772877        return parseShorthand(propId, webkitColumnsShorthand(), important);
    2878     case CSSPropertyWebkitColumnRule:
     2878    case CSSPropertyColumnRule:
    28792879        return parseShorthand(propId, webkitColumnRuleShorthand(), important);
    28802880    case CSSPropertyWebkitTextStroke:
    … …  
    30113011    case CSSPropertyWebkitColumnBreakBefore:
    30123012    case CSSPropertyWebkitColumnBreakInside:
    3013     case CSSPropertyWebkitColumnFill:
    3014     case CSSPropertyWebkitColumnRuleStyle:
     3013    case CSSPropertyColumnFill:
     3014    case CSSPropertyColumnRuleStyle:
    30153015    case CSSPropertyAlignContent:
    30163016    case CSSPropertyAlignItems:

  • trunk/Source/WebCore/css/CSSPropertyNames.in

    r175405 r175421  
    317317-webkit-column-break-before [NewStyleBuilder, TypeName=EPageBreak, Initial=initialPageBreak]
    318318-webkit-column-break-inside [NewStyleBuilder, TypeName=EPageBreak, Initial=initialPageBreak]
    319 -webkit-column-count
    320 -webkit-column-fill [NewStyleBuilder, TypeName=ColumnFill]
    321 -webkit-column-gap
    322 -webkit-column-progression [NewStyleBuilder, TypeName=ColumnProgression]
    323 -webkit-column-rule
    324 -webkit-column-rule-color
    325 -webkit-column-rule-style [NewStyleBuilder, TypeName=EBorderStyle, Initial=initialBorderStyle]
    326 -webkit-column-rule-width [NewStyleBuilder, Converter=LineWidth<unsigned short>]
    327 -webkit-column-span [NewStyleBuilder, TypeName=ColumnSpan]
    328 -webkit-column-width
    329 -webkit-columns
     319column-count
     320-webkit-column-count = column-count
     321column-fill [NewStyleBuilder, TypeName=ColumnFill]
     322-webkit-column-fill = column-fill
     323column-gap
     324-webkit-column-gap = column-gap
     325column-progression [NewStyleBuilder, TypeName=ColumnProgression]
     326-webkit-column-progression = column-progression
     327column-rule
     328-webkit-column-rule = column-rule
     329column-rule-color
     330-webkit-column-rule-color = column-rule-color
     331column-rule-style [NewStyleBuilder, TypeName=EBorderStyle, Initial=initialBorderStyle]
     332-webkit-column-rule-style = column-rule-style
     333column-rule-width [NewStyleBuilder, Converter=LineWidth<unsigned short>]
     334-webkit-column-rule-width = column-rule-width
     335column-span [NewStyleBuilder, TypeName=ColumnSpan]
     336-webkit-column-span = column-span
     337column-width
     338-webkit-column-width = column-width
     339columns
     340-webkit-columns = columns
    330341#if defined(ENABLE_CSS_BOX_DECORATION_BREAK) && ENABLE_CSS_BOX_DECORATION_BREAK
    331342-webkit-box-decoration-break [NewStyleBuilder]

  • trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp

    r175405 r175421  
    22332233    setPropertyHandler(CSSPropertyWebkitBackgroundOrigin, CSSPropertyBackgroundOrigin);
    22342234    setPropertyHandler(CSSPropertyWebkitBackgroundSize, CSSPropertyBackgroundSize);
    2235     setPropertyHandler(CSSPropertyWebkitColumnCount, ApplyPropertyAuto<unsigned short, &RenderStyle::columnCount, &RenderStyle::setColumnCount, &RenderStyle::hasAutoColumnCount, &RenderStyle::setHasAutoColumnCount>::createHandler());
    2236     setPropertyHandler(CSSPropertyWebkitColumnGap, ApplyPropertyAuto<float, &RenderStyle::columnGap, &RenderStyle::setColumnGap, &RenderStyle::hasNormalColumnGap, &RenderStyle::setHasNormalColumnGap, ComputeLength, CSSValueNormal>::createHandler());
    2237     setPropertyHandler(CSSPropertyWebkitColumnRuleColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::columnRuleColor, &RenderStyle::setColumnRuleColor, &RenderStyle::setVisitedLinkColumnRuleColor, &RenderStyle::color>::createHandler());
    2238     setPropertyHandler(CSSPropertyWebkitColumnWidth, ApplyPropertyAuto<float, &RenderStyle::columnWidth, &RenderStyle::setColumnWidth, &RenderStyle::hasAutoColumnWidth, &RenderStyle::setHasAutoColumnWidth, ComputeLength>::createHandler());
     2235    setPropertyHandler(CSSPropertyColumnCount, ApplyPropertyAuto<unsigned short, &RenderStyle::columnCount, &RenderStyle::setColumnCount, &RenderStyle::hasAutoColumnCount, &RenderStyle::setHasAutoColumnCount>::createHandler());
     2236    setPropertyHandler(CSSPropertyColumnGap, ApplyPropertyAuto<float, &RenderStyle::columnGap, &RenderStyle::setColumnGap, &RenderStyle::hasNormalColumnGap, &RenderStyle::setHasNormalColumnGap, ComputeLength, CSSValueNormal>::createHandler());
     2237    setPropertyHandler(CSSPropertyColumnRuleColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::columnRuleColor, &RenderStyle::setColumnRuleColor, &RenderStyle::setVisitedLinkColumnRuleColor, &RenderStyle::color>::createHandler());
     2238    setPropertyHandler(CSSPropertyColumnWidth, ApplyPropertyAuto<float, &RenderStyle::columnWidth, &RenderStyle::setColumnWidth, &RenderStyle::hasAutoColumnWidth, &RenderStyle::setHasAutoColumnWidth, ComputeLength>::createHandler());
    22392239#if ENABLE(CSS_REGIONS)
    22402240    setPropertyHandler(CSSPropertyWebkitFlowFrom, ApplyPropertyString<MapNoneToNull, &RenderStyle::regionThread, &RenderStyle::setRegionThread, &RenderStyle::initialRegionThread>::createHandler());

  • trunk/Source/WebCore/css/StyleProperties.cpp

    r175067 r175421  
    152152    case CSSPropertyBorderStyle:
    153153        return get4Values(borderStyleShorthand());
    154     case CSSPropertyWebkitColumnRule:
     154    case CSSPropertyColumnRule:
    155155        return getShorthandValue(webkitColumnRuleShorthand());
    156     case CSSPropertyWebkitColumns:
     156    case CSSPropertyColumns:
    157157        return getShorthandValue(webkitColumnsShorthand());
    158158    case CSSPropertyFlex:
    … …  
    10641064    CSSPropertyOverflow, // This can be also be applied to replaced elements
    10651065    CSSPropertyWebkitAspectRatio,
    1066     CSSPropertyWebkitColumnCount,
    1067     CSSPropertyWebkitColumnGap,
    1068     CSSPropertyWebkitColumnRuleColor,
    1069     CSSPropertyWebkitColumnRuleStyle,
    1070     CSSPropertyWebkitColumnRuleWidth,
     1066    CSSPropertyColumnCount,
     1067    CSSPropertyColumnGap,
     1068    CSSPropertyColumnRuleColor,
     1069    CSSPropertyColumnRuleStyle,
     1070    CSSPropertyColumnRuleWidth,
    10711071    CSSPropertyWebkitColumnBreakBefore,
    10721072    CSSPropertyWebkitColumnBreakAfter,
    10731073    CSSPropertyWebkitColumnBreakInside,
    1074     CSSPropertyWebkitColumnWidth,
     1074    CSSPropertyColumnWidth,
    10751075    CSSPropertyPageBreakAfter,
    10761076    CSSPropertyPageBreakBefore,

  • trunk/Source/WebCore/css/StylePropertyShorthand.cpp

    r173572 r175421  
    320320StylePropertyShorthand webkitColumnsShorthand()
    321321{
    322     static const CSSPropertyID columnsProperties[] = { CSSPropertyWebkitColumnWidth, CSSPropertyWebkitColumnCount };
    323     return StylePropertyShorthand(CSSPropertyWebkitColumns, columnsProperties, WTF_ARRAY_LENGTH(columnsProperties));
     322    static const CSSPropertyID columnsProperties[] = { CSSPropertyColumnWidth, CSSPropertyColumnCount };
     323    return StylePropertyShorthand(CSSPropertyColumns, columnsProperties, WTF_ARRAY_LENGTH(columnsProperties));
    324324}
    325325
    … …  
    327327{
    328328    static const CSSPropertyID columnRuleProperties[] = {
    329         CSSPropertyWebkitColumnRuleWidth,
    330         CSSPropertyWebkitColumnRuleStyle,
    331         CSSPropertyWebkitColumnRuleColor,
    332     };
    333     return StylePropertyShorthand(CSSPropertyWebkitColumnRule, columnRuleProperties, WTF_ARRAY_LENGTH(columnRuleProperties));
     329        CSSPropertyColumnRuleWidth,
     330        CSSPropertyColumnRuleStyle,
     331        CSSPropertyColumnRuleColor,
     332    };
     333    return StylePropertyShorthand(CSSPropertyColumnRule, columnRuleProperties, WTF_ARRAY_LENGTH(columnRuleProperties));
    334334}
    335335
    … …  
    570570    case CSSPropertyWebkitBorderRadius:
    571571        return borderRadiusShorthand();
    572     case CSSPropertyWebkitColumns:
     572    case CSSPropertyColumns:
    573573        return webkitColumnsShorthand();
    574     case CSSPropertyWebkitColumnRule:
     574    case CSSPropertyColumnRule:
    575575        return webkitColumnRuleShorthand();
    576576    case CSSPropertyFlex:
    … …  
    764764    case CSSPropertyWebkitBorderStartColor:
    765765        return makeVector(webkitBorderStartShorthand());
    766     case CSSPropertyWebkitColumnWidth:
    767     case CSSPropertyWebkitColumnCount:
     766    case CSSPropertyColumnWidth:
     767    case CSSPropertyColumnCount:
    768768        return makeVector(webkitColumnsShorthand());
    769     case CSSPropertyWebkitColumnRuleWidth:
    770     case CSSPropertyWebkitColumnRuleStyle:
    771     case CSSPropertyWebkitColumnRuleColor:
     769    case CSSPropertyColumnRuleWidth:
     770    case CSSPropertyColumnRuleStyle:
     771    case CSSPropertyColumnRuleColor:
    772772        return makeVector(webkitColumnRuleShorthand());
    773773    case CSSPropertyFlexGrow:

  • trunk/Source/WebCore/css/StyleResolver.cpp

    r175123 r175421  
    17931793    case CSSPropertyColor:
    17941794    case CSSPropertyOutlineColor:
    1795     case CSSPropertyWebkitColumnRuleColor:
     1795    case CSSPropertyColumnRuleColor:
    17961796    case CSSPropertyWebkitTextDecorationColor:
    17971797    case CSSPropertyWebkitTextEmphasisColor:
    … …  
    23692369    case CSSPropertyWebkitBorderStart:
    23702370    case CSSPropertyWebkitBorderRadius:
    2371     case CSSPropertyWebkitColumns:
    2372     case CSSPropertyWebkitColumnRule:
     2371    case CSSPropertyColumns:
     2372    case CSSPropertyColumnRule:
    23732373    case CSSPropertyFlex:
    23742374    case CSSPropertyFlexFlow:
    … …  
    30943094    case CSSPropertyWebkitColumnBreakBefore:
    30953095    case CSSPropertyWebkitColumnBreakInside:
    3096     case CSSPropertyWebkitColumnCount:
    3097     case CSSPropertyWebkitColumnGap:
    3098     case CSSPropertyWebkitColumnProgression:
    3099     case CSSPropertyWebkitColumnRuleColor:
    3100     case CSSPropertyWebkitColumnRuleStyle:
    3101     case CSSPropertyWebkitColumnRuleWidth:
    3102     case CSSPropertyWebkitColumnSpan:
    3103     case CSSPropertyWebkitColumnWidth:
     3096    case CSSPropertyColumnCount:
     3097    case CSSPropertyColumnGap:
     3098    case CSSPropertyColumnProgression:
     3099    case CSSPropertyColumnRuleColor:
     3100    case CSSPropertyColumnRuleStyle:
     3101    case CSSPropertyColumnRuleWidth:
     3102    case CSSPropertyColumnSpan:
     3103    case CSSPropertyColumnWidth:
    31043104#if ENABLE(CURSOR_VISIBILITY)
    31053105    case CSSPropertyWebkitCursorVisibility:

  • trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp

    r174840 r175421  
    11821182#endif
    11831183            &RenderStyle::setFontSize),
    1184         new PropertyWrapper<unsigned short>(CSSPropertyWebkitColumnRuleWidth, &RenderStyle::columnRuleWidth, &RenderStyle::setColumnRuleWidth),
    1185         new PropertyWrapper<float>(CSSPropertyWebkitColumnGap, &RenderStyle::columnGap, &RenderStyle::setColumnGap),
    1186         new PropertyWrapper<unsigned short>(CSSPropertyWebkitColumnCount, &RenderStyle::columnCount, &RenderStyle::setColumnCount),
    1187         new PropertyWrapper<float>(CSSPropertyWebkitColumnWidth, &RenderStyle::columnWidth, &RenderStyle::setColumnWidth),
     1184        new PropertyWrapper<unsigned short>(CSSPropertyColumnRuleWidth, &RenderStyle::columnRuleWidth, &RenderStyle::setColumnRuleWidth),
     1185        new PropertyWrapper<float>(CSSPropertyColumnGap, &RenderStyle::columnGap, &RenderStyle::setColumnGap),
     1186        new PropertyWrapper<unsigned short>(CSSPropertyColumnCount, &RenderStyle::columnCount, &RenderStyle::setColumnCount),
     1187        new PropertyWrapper<float>(CSSPropertyColumnWidth, &RenderStyle::columnWidth, &RenderStyle::setColumnWidth),
    11881188        new PropertyWrapper<short>(CSSPropertyWebkitBorderHorizontalSpacing, &RenderStyle::horizontalBorderSpacing, &RenderStyle::setHorizontalBorderSpacing),
    11891189        new PropertyWrapper<short>(CSSPropertyWebkitBorderVerticalSpacing, &RenderStyle::verticalBorderSpacing, &RenderStyle::setVerticalBorderSpacing),
    … …  
    12241224#endif
    12251225
    1226         new PropertyWrapperVisitedAffectedColor(CSSPropertyWebkitColumnRuleColor, MaybeInvalidColor, &RenderStyle::columnRuleColor, &RenderStyle::setColumnRuleColor, &RenderStyle::visitedLinkColumnRuleColor, &RenderStyle::setVisitedLinkColumnRuleColor),
     1226        new PropertyWrapperVisitedAffectedColor(CSSPropertyColumnRuleColor, MaybeInvalidColor, &RenderStyle::columnRuleColor, &RenderStyle::setColumnRuleColor, &RenderStyle::visitedLinkColumnRuleColor, &RenderStyle::setVisitedLinkColumnRuleColor),
    12271227        new PropertyWrapperVisitedAffectedColor(CSSPropertyWebkitTextStrokeColor, MaybeInvalidColor, &RenderStyle::textStrokeColor, &RenderStyle::setTextStrokeColor, &RenderStyle::visitedLinkTextStrokeColor, &RenderStyle::setVisitedLinkTextStrokeColor),
    12281228        new PropertyWrapperVisitedAffectedColor(CSSPropertyWebkitTextFillColor, MaybeInvalidColor, &RenderStyle::textFillColor, &RenderStyle::setTextFillColor, &RenderStyle::visitedLinkTextFillColor, &RenderStyle::setVisitedLinkTextFillColor),
    … …  
    12861286        CSSPropertyPadding,
    12871287        CSSPropertyWebkitTextStroke,
    1288         CSSPropertyWebkitColumnRule,
     1288        CSSPropertyColumnRule,
    12891289        CSSPropertyWebkitBorderRadius,
    12901290        CSSPropertyWebkitTransformOrigin
    … …  
    12981298    // Compound properties that have components that should be animatable:
    12991299    //
    1300     //  CSSPropertyWebkitColumns
     1300    //  CSSPropertyColumns
    13011301    //  CSSPropertyWebkitBoxReflect
    13021302

  • trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp

    r174875 r175421  
    574574    RenderMultiColumnFlowThread* flowThread = multiColumnFlowThread();
    575575    const RenderStyle& blockStyle = parent()->style();
    576     const Color& ruleColor = blockStyle.visitedDependentColor(CSSPropertyWebkitColumnRuleColor);
     576    const Color& ruleColor = blockStyle.visitedDependentColor(CSSPropertyColumnRuleColor);
    577577    bool ruleTransparent = blockStyle.columnRuleIsTransparent();
    578578    EBorderStyle ruleStyle = blockStyle.columnRuleStyle();

  • trunk/Source/WebCore/rendering/style/RenderStyle.cpp

    r175363 r175421  
    15231523        result = visitedLink ? visitedLinkOutlineColor() : outlineColor();
    15241524        break;
    1525     case CSSPropertyWebkitColumnRuleColor:
     1525    case CSSPropertyColumnRuleColor:
    15261526        result = visitedLink ? visitedLinkColumnRuleColor() : columnRuleColor();
    15271527        break;
Note: See TracChangeset for help on using the changeset viewer.