Changeset 173572 in webkit


Ignore:
Timestamp:
Sep 12, 2014 1:46:05 PM (10 years ago)
Author:
dino@apple.com
Message:

Unprefix the flexbox CSS properties
https://bugs.webkit.org/show_bug.cgi?id=98420

Reviewed by Benjamin Poulain.

Source/WebCore:

Remove the need for a "-webkit-" prefix on flexbox
and related properties. This includes:

  • align-content
  • align-items
  • align-self
  • flex-basis
  • flex-direction
  • flex-wrap
  • flex-grow
  • flex-shrink
  • flex
  • flex-flow
  • justify
  • order

... as well as the display keyword values "flex" and
"inline-flex".

  • css/CSSComputedStyleDeclaration.cpp: Change names.

(WebCore::ComputedStyleExtractor::propertyValue):

  • css/CSSParser.cpp: Ditto.

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

  • css/CSSPrimitiveValueMappings.h: Since we need to still handle the old

keywords for display, this has added two new keywords.
(WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
(WebCore::CSSPrimitiveValue::operator EDisplay): If the older keywords were used in
content, map them to the new value names.

  • css/CSSPropertyNames.in: Add aliases for the prefixed properties.
  • css/CSSValueKeywords.in: Add "flex" and "inline-flex".
  • css/DeprecatedStyleBuilder.cpp: Change names.

(WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):

  • css/StyleProperties.cpp: Change names.

(WebCore::StyleProperties::getPropertyValue):
(WebCore::StyleProperties::asText):

  • css/StylePropertyShorthand.cpp: Rename shorthand methods to remove the prefix.

(WebCore::flexFlowShorthand):
(WebCore::flexShorthand):
(WebCore::shorthandForProperty):
(WebCore::matchingShorthandsForLonghand):
(WebCore::webkitFlexFlowShorthand): Deleted.
(WebCore::webkitFlexShorthand): Deleted.

  • css/StylePropertyShorthand.h:
  • css/StyleResolver.cpp:

(WebCore::equivalentBlockDisplay):
(WebCore::StyleResolver::applyProperty):

  • page/animation/CSSPropertyAnimation.cpp: Change names.

(WebCore::PropertyWrapperFlex::PropertyWrapperFlex):

  • rendering/RenderElement.cpp:

(WebCore::RenderElement::createFor): Handle the two new display values (the same way as
the old values).

  • rendering/style/RenderStyleConstants.h: Add constants for the new display values.

LayoutTests:

Now that we return "flex" instead of "-webkit-flex" (and similar
changes) update the tests that rely on this. Other than that,
we're still testing the prefixed content. A followup patch
will add tests for non-prefixed content.

  • css3/flexbox/display-flexbox-set-get-expected.txt:
  • css3/flexbox/display-flexbox-set-get.html:
  • css3/flexbox/flexitem.html:
  • fast/css-grid-layout/grid-item-display.html:
  • fast/css/getComputedStyle/computed-style-expected.txt:
  • fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
  • fast/css/getComputedStyle/resources/property-names.js:
  • fast/css/inherit-initial-shorthand-values-expected.txt:
  • fast/css/inherit-initial-shorthand-values.html:
  • svg/css/getComputedStyle-basic-expected.txt:
  • transitions/flex-transitions-expected.txt:
  • transitions/flex-transitions.html:
Location:
trunk
Files:
27 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r173571 r173572  
     12014-09-12  Dean Jackson  <dino@apple.com>
     2
     3        Unprefix the flexbox CSS properties
     4        https://bugs.webkit.org/show_bug.cgi?id=98420
     5
     6        Reviewed by Benjamin Poulain.
     7
     8        Now that we return "flex" instead of "-webkit-flex" (and similar
     9        changes) update the tests that rely on this. Other than that,
     10        we're still testing the prefixed content. A followup patch
     11        will add tests for non-prefixed content.
     12
     13        * css3/flexbox/display-flexbox-set-get-expected.txt:
     14        * css3/flexbox/display-flexbox-set-get.html:
     15        * css3/flexbox/flexitem.html:
     16        * fast/css-grid-layout/grid-item-display.html:
     17        * fast/css/getComputedStyle/computed-style-expected.txt:
     18        * fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
     19        * fast/css/getComputedStyle/resources/property-names.js:
     20        * fast/css/inherit-initial-shorthand-values-expected.txt:
     21        * fast/css/inherit-initial-shorthand-values.html:
     22        * svg/css/getComputedStyle-basic-expected.txt:
     23        * transitions/flex-transitions-expected.txt:
     24        * transitions/flex-transitions.html:
     25
    1262014-09-12  Yusuke Suzuki  <utatane.tea@gmail.com>
    227
  • trunk/LayoutTests/css3/flexbox/display-flexbox-set-get-expected.txt

    r117385 r173572  
    55
    66Test getting |display| set through CSS
    7 PASS getComputedStyle(flexboxElement, '').getPropertyValue('display') is '-webkit-flex'
    8 PASS getComputedStyle(inlineFlexboxElement, '').getPropertyValue('display') is '-webkit-inline-flex'
     7PASS getComputedStyle(flexboxElement, '').getPropertyValue('display') is 'flex'
     8PASS getComputedStyle(inlineFlexboxElement, '').getPropertyValue('display') is 'inline-flex'
    99
    1010Test getting and setting display through JS
    1111PASS getComputedStyle(element, '').getPropertyValue('display') is 'block'
    12 PASS getComputedStyle(element, '').getPropertyValue('display') is '-webkit-flex'
     12PASS getComputedStyle(element, '').getPropertyValue('display') is 'flex'
    1313PASS getComputedStyle(element, '').getPropertyValue('display') is 'block'
    14 PASS getComputedStyle(element, '').getPropertyValue('display') is '-webkit-inline-flex'
     14PASS getComputedStyle(element, '').getPropertyValue('display') is 'inline-flex'
    1515PASS successfullyParsed is true
    1616
  • trunk/LayoutTests/css3/flexbox/display-flexbox-set-get.html

    r155275 r173572  
    1616debug("Test getting |display| set through CSS");
    1717var flexboxElement = document.getElementById("flexbox");
    18 shouldBe("getComputedStyle(flexboxElement, '').getPropertyValue('display')", "'-webkit-flex'");
     18shouldBe("getComputedStyle(flexboxElement, '').getPropertyValue('display')", "'flex'");
    1919var inlineFlexboxElement = document.getElementById("flexboxInline");
    20 shouldBe("getComputedStyle(inlineFlexboxElement, '').getPropertyValue('display')", "'-webkit-inline-flex'");
     20shouldBe("getComputedStyle(inlineFlexboxElement, '').getPropertyValue('display')", "'inline-flex'");
    2121
    2222debug("");
     
    2626shouldBe("getComputedStyle(element, '').getPropertyValue('display')", "'block'");
    2727element.style.display = "-webkit-flex";
    28 shouldBe("getComputedStyle(element, '').getPropertyValue('display')", "'-webkit-flex'");
     28shouldBe("getComputedStyle(element, '').getPropertyValue('display')", "'flex'");
    2929
    3030element = document.createElement("div");
     
    3232shouldBe("getComputedStyle(element, '').getPropertyValue('display')", "'block'");
    3333element.style.display = "-webkit-inline-flex";
    34 shouldBe("getComputedStyle(element, '').getPropertyValue('display')", "'-webkit-inline-flex'");
     34shouldBe("getComputedStyle(element, '').getPropertyValue('display')", "'inline-flex'");
    3535</script>
    3636<script src="../../resources/js-test-post.js"></script>
  • trunk/LayoutTests/css3/flexbox/flexitem.html

    r168350 r173572  
    7272  <div data-expected-display="block" data-expected-width="100" style="display: inline-block;"></div>
    7373  <div data-expected-display="-webkit-box" data-expected-width="100" style="display: -webkit-inline-box;"></div>
    74   <div data-expected-display="-webkit-flex" data-expected-width="100" style="display: -webkit-inline-flex;"></div>
     74  <div data-expected-display="flex" data-expected-width="100" style="display: -webkit-inline-flex;"></div>
    7575  <div data-expected-display="block" data-expected-width="100" style="display: table-cell"></div>
    7676  <div data-expected-display="block" data-expected-width="100" style="display: compact"></div>
  • trunk/LayoutTests/fast/css-grid-layout/grid-item-display.html

    r169334 r173572  
    3535
    3636        <!-- Some extra values we support. -->
    37         <div data-expected-display="-webkit-flex" data-offset-x="50" data-offset-y="150" style="display: -webkit-flex"></div>
    38         <div data-expected-display="-webkit-flex" data-offset-x="50" data-offset-y="150" style="display: -webkit-inline-flex"></div>
     37        <div data-expected-display="flex" data-offset-x="50" data-offset-y="150" style="display: -webkit-flex"></div>
     38        <div data-expected-display="flex" data-offset-x="50" data-offset-y="150" style="display: -webkit-inline-flex"></div>
    3939        <div data-expected-display="block" data-offset-x="50" data-offset-y="150" style="display: -webkit-inline-block"></div>
    4040        <div data-expected-display="block" data-offset-x="50" data-offset-y="150" style="display: compact"></div>
  • trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt

    r172711 r173572  
    144144-webkit-column-span: none;
    145145-webkit-column-width: auto;
    146 -webkit-align-content: stretch;
    147 -webkit-align-items: stretch;
    148 -webkit-align-self: stretch;
    149 -webkit-flex-direction: row;
    150 -webkit-flex-wrap: nowrap;
    151 -webkit-justify-content: flex-start;
     146align-content: stretch;
     147align-items: stretch;
     148align-self: stretch;
     149flex-direction: row;
     150flex-wrap: nowrap;
     151justify-content: flex-start;
    152152-webkit-font-kerning: auto;
    153153-webkit-font-smoothing: auto;
     
    194194-webkit-mask-size: auto;
    195195-webkit-nbsp-mode: normal;
    196 -webkit-order: 0;
     196order: 0;
    197197-webkit-perspective: none;
    198198-webkit-perspective-origin: 392px 288px;
  • trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt

    r172711 r173572  
    143143-webkit-column-span: none
    144144-webkit-column-width: auto
    145 -webkit-align-content: stretch
    146 -webkit-align-items: stretch
    147 -webkit-align-self: stretch
    148 -webkit-flex-direction: row
    149 -webkit-flex-wrap: nowrap
    150 -webkit-justify-content: flex-start
     145align-content: stretch
     146align-items: stretch
     147align-self: stretch
     148flex-direction: row
     149flex-wrap: nowrap
     150justify-content: flex-start
    151151-webkit-font-kerning: auto
    152152-webkit-font-smoothing: auto
     
    193193-webkit-mask-size: auto
    194194-webkit-nbsp-mode: normal
    195 -webkit-order: 0
     195order: 0
    196196-webkit-perspective: none
    197197-webkit-perspective-origin: 50% 50%
  • trunk/LayoutTests/fast/css/getComputedStyle/resources/property-names.js

    r164719 r173572  
    11// We only test properties that are exposed in all ports.
    22var propertiesToTest = {
    3     "-webkit-align-content": true,
    4     "-webkit-align-items": true,
    5     "-webkit-align-self": true,
     3    "align-content": true,
     4    "align-items": true,
     5    "align-self": true,
    66    "-webkit-animation-delay": true,
    77    "-webkit-animation-direction": true,
     
    4545    "-webkit-column-span": true,
    4646    "-webkit-column-width": true,
    47     "-webkit-flex-direction": true,
    48     "-webkit-flex-wrap": true,
     47    "flex-direction": true,
     48    "flex-wrap": true,
    4949    "-webkit-font-kerning": true,
    5050    "-webkit-font-smoothing": true,
     
    6565    "-webkit-hyphenate-limit-lines": true,
    6666    "-webkit-hyphens": true,
    67     "-webkit-justify-content": true,
     67    "justify-content": true,
    6868    "-webkit-line-align": true,
    6969    "-webkit-line-box-contain": true,
     
    9494    "-webkit-mask-size": true,
    9595    "-webkit-nbsp-mode": true,
    96     "-webkit-order": true,
     96    "order": true,
    9797    "-webkit-perspective": true,
    9898    "-webkit-perspective-origin": true,
  • trunk/LayoutTests/fast/css/inherit-initial-shorthand-values-expected.txt

    r135848 r173572  
    2525PASS test('webkit-columns') is "inherit, initial"
    2626PASS test('webkit-column-rule') is "inherit, initial"
    27 PASS test('webkit-flex-flow') is "inherit, initial"
    28 PASS test('webkit-flex') is "inherit, initial"
     27PASS test('flex-flow') is "inherit, initial"
     28PASS test('flex') is "inherit, initial"
    2929PASS test('webkit-marginCollapse') is "inherit, initial"
    3030PASS test('webkit-marquee') is "inherit, initial"
  • trunk/LayoutTests/fast/css/inherit-initial-shorthand-values.html

    r155263 r173572  
    4343    "webkit-columns",
    4444    "webkit-column-rule",
    45     "webkit-flex-flow",
    46     "webkit-flex",
     45    "flex-flow",
     46    "flex",
    4747    "webkit-marginCollapse",
    4848    "webkit-marquee",
  • trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt

    r172711 r173572  
    285285rect: style.getPropertyValue(-webkit-column-width) : auto
    286286rect: style.getPropertyCSSValue(-webkit-column-width) : [object CSSPrimitiveValue]
    287 rect: style.getPropertyValue(-webkit-align-content) : stretch
    288 rect: style.getPropertyCSSValue(-webkit-align-content) : [object CSSPrimitiveValue]
    289 rect: style.getPropertyValue(-webkit-align-items) : stretch
    290 rect: style.getPropertyCSSValue(-webkit-align-items) : [object CSSPrimitiveValue]
    291 rect: style.getPropertyValue(-webkit-align-self) : stretch
    292 rect: style.getPropertyCSSValue(-webkit-align-self) : [object CSSPrimitiveValue]
    293 rect: style.getPropertyValue(-webkit-flex-direction) : row
    294 rect: style.getPropertyCSSValue(-webkit-flex-direction) : [object CSSPrimitiveValue]
    295 rect: style.getPropertyValue(-webkit-flex-wrap) : nowrap
    296 rect: style.getPropertyCSSValue(-webkit-flex-wrap) : [object CSSPrimitiveValue]
    297 rect: style.getPropertyValue(-webkit-justify-content) : flex-start
    298 rect: style.getPropertyCSSValue(-webkit-justify-content) : [object CSSPrimitiveValue]
     287rect: style.getPropertyValue(align-content) : stretch
     288rect: style.getPropertyCSSValue(align-content) : [object CSSPrimitiveValue]
     289rect: style.getPropertyValue(align-items) : stretch
     290rect: style.getPropertyCSSValue(align-items) : [object CSSPrimitiveValue]
     291rect: style.getPropertyValue(align-self) : stretch
     292rect: style.getPropertyCSSValue(align-self) : [object CSSPrimitiveValue]
     293rect: style.getPropertyValue(flex-direction) : row
     294rect: style.getPropertyCSSValue(flex-direction) : [object CSSPrimitiveValue]
     295rect: style.getPropertyValue(flex-wrap) : nowrap
     296rect: style.getPropertyCSSValue(flex-wrap) : [object CSSPrimitiveValue]
     297rect: style.getPropertyValue(justify-content) : flex-start
     298rect: style.getPropertyCSSValue(justify-content) : [object CSSPrimitiveValue]
    299299rect: style.getPropertyValue(-webkit-font-kerning) : auto
    300300rect: style.getPropertyCSSValue(-webkit-font-kerning) : [object CSSPrimitiveValue]
     
    385385rect: style.getPropertyValue(-webkit-nbsp-mode) : normal
    386386rect: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue]
    387 rect: style.getPropertyValue(-webkit-order) : 0
    388 rect: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue]
     387rect: style.getPropertyValue(order) : 0
     388rect: style.getPropertyCSSValue(order) : [object CSSPrimitiveValue]
    389389rect: style.getPropertyValue(-webkit-perspective) : none
    390390rect: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue]
     
    797797g: style.getPropertyValue(-webkit-column-width) : auto
    798798g: style.getPropertyCSSValue(-webkit-column-width) : [object CSSPrimitiveValue]
    799 g: style.getPropertyValue(-webkit-align-content) : stretch
    800 g: style.getPropertyCSSValue(-webkit-align-content) : [object CSSPrimitiveValue]
    801 g: style.getPropertyValue(-webkit-align-items) : stretch
    802 g: style.getPropertyCSSValue(-webkit-align-items) : [object CSSPrimitiveValue]
    803 g: style.getPropertyValue(-webkit-align-self) : stretch
    804 g: style.getPropertyCSSValue(-webkit-align-self) : [object CSSPrimitiveValue]
    805 g: style.getPropertyValue(-webkit-flex-direction) : row
    806 g: style.getPropertyCSSValue(-webkit-flex-direction) : [object CSSPrimitiveValue]
    807 g: style.getPropertyValue(-webkit-flex-wrap) : nowrap
    808 g: style.getPropertyCSSValue(-webkit-flex-wrap) : [object CSSPrimitiveValue]
    809 g: style.getPropertyValue(-webkit-justify-content) : flex-start
    810 g: style.getPropertyCSSValue(-webkit-justify-content) : [object CSSPrimitiveValue]
     799g: style.getPropertyValue(align-content) : stretch
     800g: style.getPropertyCSSValue(align-content) : [object CSSPrimitiveValue]
     801g: style.getPropertyValue(align-items) : stretch
     802g: style.getPropertyCSSValue(align-items) : [object CSSPrimitiveValue]
     803g: style.getPropertyValue(align-self) : stretch
     804g: style.getPropertyCSSValue(align-self) : [object CSSPrimitiveValue]
     805g: style.getPropertyValue(flex-direction) : row
     806g: style.getPropertyCSSValue(flex-direction) : [object CSSPrimitiveValue]
     807g: style.getPropertyValue(flex-wrap) : nowrap
     808g: style.getPropertyCSSValue(flex-wrap) : [object CSSPrimitiveValue]
     809g: style.getPropertyValue(justify-content) : flex-start
     810g: style.getPropertyCSSValue(justify-content) : [object CSSPrimitiveValue]
    811811g: style.getPropertyValue(-webkit-font-kerning) : auto
    812812g: style.getPropertyCSSValue(-webkit-font-kerning) : [object CSSPrimitiveValue]
     
    897897g: style.getPropertyValue(-webkit-nbsp-mode) : normal
    898898g: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue]
    899 g: style.getPropertyValue(-webkit-order) : 0
    900 g: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue]
     899g: style.getPropertyValue(order) : 0
     900g: style.getPropertyCSSValue(order) : [object CSSPrimitiveValue]
    901901g: style.getPropertyValue(-webkit-perspective) : none
    902902g: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue]
  • trunk/LayoutTests/transitions/flex-transitions-expected.txt

    r113264 r173572  
    1 PASS - "-webkit-flex" property for "row1" element at 0.5s saw something close to: 2,0,0
    2 PASS - "-webkit-flex" property for "column1" element at 0.5s saw something close to: 0.5,0,10
    3 PASS - "-webkit-flex" property for "negative1" element at 0.5s saw something close to: 1,0.5,75
    4 PASS - "-webkit-flex" property for "no-flex1" element at 0.5s saw something close to: 0.5,0,0
     1PASS - "flex" property for "row1" element at 0.5s saw something close to: 2,0,0
     2PASS - "flex" property for "column1" element at 0.5s saw something close to: 0.5,0,10
     3PASS - "flex" property for "negative1" element at 0.5s saw something close to: 1,0.5,75
     4PASS - "flex" property for "no-flex1" element at 0.5s saw something close to: 0.5,0,0
    55
  • trunk/LayoutTests/transitions/flex-transitions.html

    r119191 r173572  
    2121
    2222#flex-row div {
    23     -webkit-flex: 1 0 0px;
     23    flex: 1 0 0px;
    2424}
    2525.final #row1 {
    26     -webkit-flex: 3 0 0px;
     26    flex: 3 0 0px;
    2727}
    2828
    2929#flex-column {
    30     -webkit-flex-direction: column;
     30    flex-direction: column;
    3131}
    3232#flex-column div {
    33     -webkit-flex: 1 0 0px;
     33    flex: 1 0 0px;
    3434}
    3535.final #column1 {
    36     -webkit-flex: 0 0 20px;
     36    flex: 0 0 20px;
    3737}
    3838
    3939#flex-negative div {
    40     -webkit-flex: 1 1 50px;
     40    flex: 1 1 50px;
    4141}
    4242.final #negative1 {
    43     -webkit-flex: 1 100px;
     43    flex: 1 100px;
    4444}
    4545
     
    5757    const expectedValues = [
    5858      // [time, element-id, property, expected-value, tolerance]
    59       [0.5, 'row1', '-webkit-flex', [2, 0, 0], .5],
    60       [0.5, 'column1', '-webkit-flex', [.5, 0, 10], 3],
    61       [0.5, 'negative1', '-webkit-flex', [1, .5, 75], 3],
    62       [0.5, 'no-flex1', '-webkit-flex', [.5, 0, 0], .4],
     59      [0.5, 'row1', 'flex', [2, 0, 0], .5],
     60      [0.5, 'column1', 'flex', [.5, 0, 10], 3],
     61      [0.5, 'negative1', 'flex', [1, .5, 75], 3],
     62      [0.5, 'no-flex1', 'flex', [.5, 0, 0], .4],
    6363    ];
    6464
  • trunk/Source/WebCore/ChangeLog

    r173571 r173572  
     12014-09-12  Dean Jackson  <dino@apple.com>
     2
     3        Unprefix the flexbox CSS properties
     4        https://bugs.webkit.org/show_bug.cgi?id=98420
     5
     6        Reviewed by Benjamin Poulain.
     7
     8        Remove the need for a "-webkit-" prefix on flexbox
     9        and related properties. This includes:
     10        - align-content
     11        - align-items
     12        - align-self
     13        - flex-basis
     14        - flex-direction
     15        - flex-wrap
     16        - flex-grow
     17        - flex-shrink
     18        - flex
     19        - flex-flow
     20        - justify
     21        - order
     22
     23        ... as well as the display keyword values "flex" and
     24        "inline-flex".
     25
     26        * css/CSSComputedStyleDeclaration.cpp:  Change names.
     27        (WebCore::ComputedStyleExtractor::propertyValue):
     28        * css/CSSParser.cpp: Ditto.
     29        (WebCore::isValidKeywordPropertyAndValue):
     30        (WebCore::isKeywordPropertyID):
     31        (WebCore::CSSParser::parseValue):
     32        (WebCore::CSSParser::parseFlex):
     33        * css/CSSPrimitiveValueMappings.h: Since we need to still handle the old
     34        keywords for display, this has added two new keywords.
     35        (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
     36        (WebCore::CSSPrimitiveValue::operator EDisplay): If the older keywords were used in
     37        content, map them to the new value names.
     38        * css/CSSPropertyNames.in: Add aliases for the prefixed properties.
     39        * css/CSSValueKeywords.in: Add "flex" and "inline-flex".
     40        * css/DeprecatedStyleBuilder.cpp: Change names.
     41        (WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
     42        * css/StyleProperties.cpp: Change names.
     43        (WebCore::StyleProperties::getPropertyValue):
     44        (WebCore::StyleProperties::asText):
     45        * css/StylePropertyShorthand.cpp: Rename shorthand methods to remove the prefix.
     46        (WebCore::flexFlowShorthand):
     47        (WebCore::flexShorthand):
     48        (WebCore::shorthandForProperty):
     49        (WebCore::matchingShorthandsForLonghand):
     50        (WebCore::webkitFlexFlowShorthand): Deleted.
     51        (WebCore::webkitFlexShorthand): Deleted.
     52        * css/StylePropertyShorthand.h:
     53        * css/StyleResolver.cpp:
     54        (WebCore::equivalentBlockDisplay):
     55        (WebCore::StyleResolver::applyProperty):
     56        * page/animation/CSSPropertyAnimation.cpp: Change names.
     57        (WebCore::PropertyWrapperFlex::PropertyWrapperFlex):
     58        * rendering/RenderElement.cpp:
     59        (WebCore::RenderElement::createFor): Handle the two new display values (the same way as
     60        the old values).
     61        * rendering/style/RenderStyleConstants.h: Add constants for the new display values.
     62
    1632014-09-12  Yusuke Suzuki  <utatane.tea@gmail.com>
    264
  • trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

    r173499 r173572  
    281281    CSSPropertyWebkitDashboardRegion,
    282282#endif
    283     CSSPropertyWebkitAlignContent,
    284     CSSPropertyWebkitAlignItems,
    285     CSSPropertyWebkitAlignSelf,
    286     CSSPropertyWebkitFlexBasis,
    287     CSSPropertyWebkitFlexGrow,
    288     CSSPropertyWebkitFlexShrink,
    289     CSSPropertyWebkitFlexDirection,
    290     CSSPropertyWebkitFlexWrap,
    291     CSSPropertyWebkitJustifyContent,
    292     CSSPropertyWebkitJustifySelf,
     283    CSSPropertyAlignContent,
     284    CSSPropertyAlignItems,
     285    CSSPropertyAlignSelf,
     286    CSSPropertyFlexBasis,
     287    CSSPropertyFlexGrow,
     288    CSSPropertyFlexShrink,
     289    CSSPropertyFlexDirection,
     290    CSSPropertyFlexWrap,
     291    CSSPropertyJustifyContent,
     292    CSSPropertyJustifySelf,
    293293    CSSPropertyWebkitFilter,
    294294    CSSPropertyWebkitFontKerning,
     
    341341    CSSPropertyWebkitMaskSourceType,
    342342    CSSPropertyWebkitNbspMode,
    343     CSSPropertyWebkitOrder,
     343    CSSPropertyOrder,
    344344#if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
    345345    CSSPropertyWebkitOverflowScrolling,
     
    20272027        case CSSPropertyEmptyCells:
    20282028            return cssValuePool().createValue(style->emptyCells());
    2029         case CSSPropertyWebkitAlignContent:
     2029        case CSSPropertyAlignContent:
    20302030            return cssValuePool().createValue(style->alignContent());
    2031         case CSSPropertyWebkitAlignItems:
     2031        case CSSPropertyAlignItems:
    20322032            return cssValuePool().createValue(style->alignItems());
    2033         case CSSPropertyWebkitAlignSelf:
     2033        case CSSPropertyAlignSelf:
    20342034            if (style->alignSelf() == AlignAuto) {
    20352035                Node* parent = styledNode->parentNode();
     
    20392039            }
    20402040            return cssValuePool().createValue(style->alignSelf());
    2041         case CSSPropertyWebkitFlex:
    2042             return getCSSPropertyValuesForShorthandProperties(webkitFlexShorthand());
    2043         case CSSPropertyWebkitFlexBasis:
     2041        case CSSPropertyFlex:
     2042            return getCSSPropertyValuesForShorthandProperties(flexShorthand());
     2043        case CSSPropertyFlexBasis:
    20442044            return cssValuePool().createValue(style->flexBasis());
    2045         case CSSPropertyWebkitFlexDirection:
     2045        case CSSPropertyFlexDirection:
    20462046            return cssValuePool().createValue(style->flexDirection());
    2047         case CSSPropertyWebkitFlexFlow:
    2048             return getCSSPropertyValuesForShorthandProperties(webkitFlexFlowShorthand());
    2049         case CSSPropertyWebkitFlexGrow:
     2047        case CSSPropertyFlexFlow:
     2048            return getCSSPropertyValuesForShorthandProperties(flexFlowShorthand());
     2049        case CSSPropertyFlexGrow:
    20502050            return cssValuePool().createValue(style->flexGrow());
    2051         case CSSPropertyWebkitFlexShrink:
     2051        case CSSPropertyFlexShrink:
    20522052            return cssValuePool().createValue(style->flexShrink());
    2053         case CSSPropertyWebkitFlexWrap:
     2053        case CSSPropertyFlexWrap:
    20542054            return cssValuePool().createValue(style->flexWrap());
    2055         case CSSPropertyWebkitJustifyContent:
     2055        case CSSPropertyJustifyContent:
    20562056            return cssValuePool().createValue(style->justifyContent());
    2057         case CSSPropertyWebkitJustifySelf: {
     2057        case CSSPropertyJustifySelf: {
    20582058            RefPtr<CSSValueList> result = CSSValueList::createSpaceSeparated();
    20592059            result->append(CSSPrimitiveValue::create(style->justifySelf()));
     
    20622062            return result.release();
    20632063        }
    2064         case CSSPropertyWebkitOrder:
     2064        case CSSPropertyOrder:
    20652065            return cssValuePool().createValue(style->order(), CSSPrimitiveValue::CSS_NUMBER);
    20662066        case CSSPropertyFloat:
  • trunk/Source/WebCore/css/CSSParser.cpp

    r173499 r173572  
    680680        // inline-table | table-row-group | table-header-group | table-footer-group | table-row |
    681681        // table-column-group | table-column | table-cell | table-caption | -webkit-box | -webkit-inline-box | none | inherit
    682         // -webkit-flex | -webkit-inline-flex | -webkit-grid | -webkit-inline-grid
     682        // flex | -webkit-flex | inline-flex | -webkit-inline-flex | -webkit-grid | -webkit-inline-grid
    683683        if ((valueID >= CSSValueInline && valueID <= CSSValueWebkitInlineFlex) || valueID == CSSValueNone)
    684684            return true;
     
    864864            return true;
    865865        break;
    866     case CSSPropertyWebkitAlignContent:
     866    case CSSPropertyAlignContent:
    867867        // FIXME: Per CSS alignment, this property should accept an optional <overflow-position>. We should share this parsing code with 'justify-self'.
    868868        if (valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || valueID == CSSValueCenter || valueID == CSSValueSpaceBetween || valueID == CSSValueSpaceAround || valueID == CSSValueStretch)
    869869            return true;
    870870        break;
    871     case CSSPropertyWebkitAlignItems:
     871    case CSSPropertyAlignItems:
    872872        // FIXME: Per CSS alignment, this property should accept the same arguments as 'justify-self' so we should share its parsing code.
    873873        if (valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || valueID == CSSValueCenter || valueID == CSSValueBaseline || valueID == CSSValueStretch)
    874874            return true;
    875875        break;
    876     case CSSPropertyWebkitAlignSelf:
     876    case CSSPropertyAlignSelf:
    877877        // FIXME: Per CSS alignment, this property should accept the same arguments as 'justify-self' so we should share its parsing code.
    878878        if (valueID == CSSValueAuto || valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || valueID == CSSValueCenter || valueID == CSSValueBaseline || valueID == CSSValueStretch)
    879879            return true;
    880880        break;
    881     case CSSPropertyWebkitFlexDirection:
     881    case CSSPropertyFlexDirection:
    882882        if (valueID == CSSValueRow || valueID == CSSValueRowReverse || valueID == CSSValueColumn || valueID == CSSValueColumnReverse)
    883883            return true;
    884884        break;
    885     case CSSPropertyWebkitFlexWrap:
     885    case CSSPropertyFlexWrap:
    886886        if (valueID == CSSValueNowrap || valueID == CSSValueWrap || valueID == CSSValueWrapReverse)
    887887             return true;
    888888        break;
    889     case CSSPropertyWebkitJustifyContent:
     889    case CSSPropertyJustifyContent:
    890890        // FIXME: Per CSS alignment, this property should accept an optional <overflow-position>. We should share this parsing code with 'justify-self'.
    891891        if (valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || valueID == CSSValueCenter || valueID == CSSValueSpaceBetween || valueID == CSSValueSpaceAround)
    892892            return true;
    893893        break;
    894     case CSSPropertyWebkitJustifySelf:
     894    case CSSPropertyJustifySelf:
    895895        if (valueID == CSSValueAuto || valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || valueID == CSSValueCenter || valueID == CSSValueBaseline || valueID == CSSValueStretch)
    896896            return true;
     
    11061106    case CSSPropertyWebkitColumnFill:
    11071107    case CSSPropertyWebkitColumnRuleStyle:
    1108     case CSSPropertyWebkitAlignContent:
    1109     case CSSPropertyWebkitAlignItems:
    1110     case CSSPropertyWebkitAlignSelf:
    1111     case CSSPropertyWebkitFlexDirection:
    1112     case CSSPropertyWebkitFlexWrap:
    1113     case CSSPropertyWebkitJustifyContent:
     1108    case CSSPropertyAlignContent:
     1109    case CSSPropertyAlignItems:
     1110    case CSSPropertyAlignSelf:
     1111    case CSSPropertyFlexDirection:
     1112    case CSSPropertyFlexWrap:
     1113    case CSSPropertyJustifyContent:
    11141114    case CSSPropertyWebkitFontKerning:
    11151115    case CSSPropertyWebkitFontSmoothing:
     
    24752475        break;
    24762476#endif
    2477     case CSSPropertyWebkitFlex: {
     2477    case CSSPropertyFlex: {
    24782478        ShorthandScope scope(this, propId);
    24792479        if (id == CSSValueNone) {
    2480             addProperty(CSSPropertyWebkitFlexGrow, cssValuePool().createValue(0, CSSPrimitiveValue::CSS_NUMBER), important);
    2481             addProperty(CSSPropertyWebkitFlexShrink, cssValuePool().createValue(0, CSSPrimitiveValue::CSS_NUMBER), important);
    2482             addProperty(CSSPropertyWebkitFlexBasis, cssValuePool().createIdentifierValue(CSSValueAuto), important);
     2480            addProperty(CSSPropertyFlexGrow, cssValuePool().createValue(0, CSSPrimitiveValue::CSS_NUMBER), important);
     2481            addProperty(CSSPropertyFlexShrink, cssValuePool().createValue(0, CSSPrimitiveValue::CSS_NUMBER), important);
     2482            addProperty(CSSPropertyFlexBasis, cssValuePool().createIdentifierValue(CSSValueAuto), important);
    24832483            return true;
    24842484        }
    24852485        return parseFlex(m_valueList.get(), important);
    24862486    }
    2487     case CSSPropertyWebkitFlexBasis:
     2487    case CSSPropertyFlexBasis:
    24882488        // FIXME: Support intrinsic dimensions too.
    24892489        if (id == CSSValueAuto)
     
    24922492            validPrimitive = (!id && validUnit(value, FLength | FPercent | FNonNeg));
    24932493        break;
    2494     case CSSPropertyWebkitFlexGrow:
    2495     case CSSPropertyWebkitFlexShrink:
     2494    case CSSPropertyFlexGrow:
     2495    case CSSPropertyFlexShrink:
    24962496        validPrimitive = validUnit(value, FNumber | FNonNeg);
    24972497        break;
    2498     case CSSPropertyWebkitOrder:
     2498    case CSSPropertyOrder:
    24992499        if (validUnit(value, FInteger, CSSStrictMode)) {
    25002500            // We restrict the smallest value to int min + 2 because we use int min and int min + 1 as special values in a hash set.
     
    26162616        return false;
    26172617    }
    2618     case CSSPropertyWebkitJustifySelf:
     2618    case CSSPropertyJustifySelf:
    26192619        return parseJustifySelf(propId, important);
    26202620#if ENABLE(CSS_GRID_LAYOUT)
     
    28612861        // <padding-width>{1,4} | inherit
    28622862        return parse4Values(propId, paddingShorthand().properties(), important);
    2863     case CSSPropertyWebkitFlexFlow:
    2864         return parseShorthand(propId, webkitFlexFlowShorthand(), important);
     2863    case CSSPropertyFlexFlow:
     2864        return parseShorthand(propId, flexFlowShorthand(), important);
    28652865    case CSSPropertyFont:
    28662866        // [ [ 'font-style' || 'font-variant' || 'font-weight' ]? 'font-size' [ / 'line-height' ]?
     
    30123012    case CSSPropertyWebkitColumnFill:
    30133013    case CSSPropertyWebkitColumnRuleStyle:
    3014     case CSSPropertyWebkitAlignContent:
    3015     case CSSPropertyWebkitAlignItems:
    3016     case CSSPropertyWebkitAlignSelf:
    3017     case CSSPropertyWebkitFlexDirection:
    3018     case CSSPropertyWebkitFlexWrap:
    3019     case CSSPropertyWebkitJustifyContent:
     3014    case CSSPropertyAlignContent:
     3015    case CSSPropertyAlignItems:
     3016    case CSSPropertyAlignSelf:
     3017    case CSSPropertyFlexDirection:
     3018    case CSSPropertyFlexWrap:
     3019    case CSSPropertyJustifyContent:
    30203020    case CSSPropertyWebkitFontKerning:
    30213021    case CSSPropertyWebkitFontSmoothing:
     
    73657365        flexBasis = cssValuePool().createValue(0, CSSPrimitiveValue::CSS_PX);
    73667366
    7367     addProperty(CSSPropertyWebkitFlexGrow, cssValuePool().createValue(clampToFloat(flexGrow), CSSPrimitiveValue::CSS_NUMBER), important);
    7368     addProperty(CSSPropertyWebkitFlexShrink, cssValuePool().createValue(clampToFloat(flexShrink), CSSPrimitiveValue::CSS_NUMBER), important);
    7369     addProperty(CSSPropertyWebkitFlexBasis, flexBasis, important);
     7367    addProperty(CSSPropertyFlexGrow, cssValuePool().createValue(clampToFloat(flexGrow), CSSPrimitiveValue::CSS_NUMBER), important);
     7368    addProperty(CSSPropertyFlexShrink, cssValuePool().createValue(clampToFloat(flexShrink), CSSPrimitiveValue::CSS_NUMBER), important);
     7369    addProperty(CSSPropertyFlexBasis, flexBasis, important);
    73707370    return true;
    73717371}
  • trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h

    r172861 r173572  
    13561356        break;
    13571357    case FLEX:
    1358         m_value.valueID = CSSValueWebkitFlex;
     1358    case WEBKIT_FLEX:
     1359        m_value.valueID = CSSValueFlex;
    13591360        break;
    13601361    case INLINE_FLEX:
    1361         m_value.valueID = CSSValueWebkitInlineFlex;
     1362    case WEBKIT_INLINE_FLEX:
     1363        m_value.valueID = CSSValueInlineFlex;
    13621364        break;
    13631365#if ENABLE(CSS_GRID_LAYOUT)
     
    13841386    EDisplay display = static_cast<EDisplay>(m_value.valueID - CSSValueInline);
    13851387    ASSERT(display >= INLINE && display <= NONE);
     1388    if (display == WEBKIT_FLEX)
     1389        return FLEX;
     1390    if (display == WEBKIT_INLINE_FLEX)
     1391        return INLINE_FLEX;
    13861392    return display;
    13871393}
  • trunk/Source/WebCore/css/CSSPropertyNames.in

    r173499 r173572  
    294294#endif
    295295-webkit-filter
    296 -webkit-align-content
    297 -webkit-align-items
    298 -webkit-align-self
    299 -webkit-flex
    300 -webkit-flex-basis
    301 -webkit-flex-direction
    302 -webkit-flex-flow
    303 -webkit-flex-grow
    304 -webkit-flex-shrink
    305 -webkit-flex-wrap
    306 -webkit-justify-content
    307 -webkit-justify-self
     296align-content
     297-webkit-align-content = align-content
     298align-items
     299-webkit-align-items = align-items
     300align-self
     301-webkit-align-self = align-self
     302flex
     303-webkit-flex = flex
     304flex-basis
     305-webkit-flex-basis = flex-basis
     306flex-direction
     307-webkit-flex-direction = flex-direction
     308flex-flow
     309-webkit-flex-flow = flex-flow
     310flex-grow
     311-webkit-flex-grow = flex-grow
     312flex-shrink
     313-webkit-flex-shrink = flex-shrink
     314flex-wrap
     315-webkit-flex-wrap = flex-wrap
     316justify-content
     317-webkit-justify-content = justify-content
     318justify-self
     319-webkit-justify-self = justify-self
    308320-webkit-font-size-delta
    309321#if defined(ENABLE_CSS_GRID_LAYOUT) && ENABLE_CSS_GRID_LAYOUT
     
    378390-webkit-min-logical-height
    379391-webkit-nbsp-mode [Inherited]
    380 -webkit-order
     392order
     393-webkit-order = order
    381394-webkit-padding-after
    382395-webkit-padding-before
  • trunk/Source/WebCore/css/CSSValueKeywords.in

    r173217 r173572  
    359359-webkit-box
    360360-webkit-inline-box
     361flex
    361362-webkit-flex
     363inline-flex
    362364-webkit-inline-flex
    363365-webkit-grid
  • trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp

    r172861 r173572  
    25222522    setPropertyHandler(CSSPropertyWebkitCursorVisibility, ApplyPropertyDefault<CursorVisibility, &RenderStyle::cursorVisibility, CursorVisibility, &RenderStyle::setCursorVisibility, CursorVisibility, &RenderStyle::initialCursorVisibility>::createHandler());
    25232523#endif
    2524     setPropertyHandler(CSSPropertyWebkitAlignContent, ApplyPropertyDefault<EAlignContent, &RenderStyle::alignContent, EAlignContent, &RenderStyle::setAlignContent, EAlignContent, &RenderStyle::initialAlignContent>::createHandler());
    2525     setPropertyHandler(CSSPropertyWebkitAlignItems, ApplyPropertyDefault<EAlignItems, &RenderStyle::alignItems, EAlignItems, &RenderStyle::setAlignItems, EAlignItems, &RenderStyle::initialAlignItems>::createHandler());
    2526     setPropertyHandler(CSSPropertyWebkitAlignSelf, ApplyPropertyDefault<EAlignItems, &RenderStyle::alignSelf, EAlignItems, &RenderStyle::setAlignSelf, EAlignItems, &RenderStyle::initialAlignSelf>::createHandler());
    2527     setPropertyHandler(CSSPropertyWebkitFlexBasis, ApplyPropertyLength<&RenderStyle::flexBasis, &RenderStyle::setFlexBasis, &RenderStyle::initialFlexBasis, AutoEnabled>::createHandler());
    2528     setPropertyHandler(CSSPropertyWebkitFlexDirection, ApplyPropertyDefault<EFlexDirection, &RenderStyle::flexDirection, EFlexDirection, &RenderStyle::setFlexDirection, EFlexDirection, &RenderStyle::initialFlexDirection>::createHandler());
    2529     setPropertyHandler(CSSPropertyWebkitFlexGrow, ApplyPropertyDefault<float, &RenderStyle::flexGrow, float, &RenderStyle::setFlexGrow, float, &RenderStyle::initialFlexGrow>::createHandler());
    2530     setPropertyHandler(CSSPropertyWebkitFlexShrink, ApplyPropertyDefault<float, &RenderStyle::flexShrink, float, &RenderStyle::setFlexShrink, float, &RenderStyle::initialFlexShrink>::createHandler());
    2531     setPropertyHandler(CSSPropertyWebkitFlexWrap, ApplyPropertyDefault<EFlexWrap, &RenderStyle::flexWrap, EFlexWrap, &RenderStyle::setFlexWrap, EFlexWrap, &RenderStyle::initialFlexWrap>::createHandler());
    2532     setPropertyHandler(CSSPropertyWebkitJustifyContent, ApplyPropertyDefault<EJustifyContent, &RenderStyle::justifyContent, EJustifyContent, &RenderStyle::setJustifyContent, EJustifyContent, &RenderStyle::initialJustifyContent>::createHandler());
    2533     setPropertyHandler(CSSPropertyWebkitOrder, ApplyPropertyDefault<int, &RenderStyle::order, int, &RenderStyle::setOrder, int, &RenderStyle::initialOrder>::createHandler());
     2524    setPropertyHandler(CSSPropertyAlignContent, ApplyPropertyDefault<EAlignContent, &RenderStyle::alignContent, EAlignContent, &RenderStyle::setAlignContent, EAlignContent, &RenderStyle::initialAlignContent>::createHandler());
     2525    setPropertyHandler(CSSPropertyAlignItems, ApplyPropertyDefault<EAlignItems, &RenderStyle::alignItems, EAlignItems, &RenderStyle::setAlignItems, EAlignItems, &RenderStyle::initialAlignItems>::createHandler());
     2526    setPropertyHandler(CSSPropertyAlignSelf, ApplyPropertyDefault<EAlignItems, &RenderStyle::alignSelf, EAlignItems, &RenderStyle::setAlignSelf, EAlignItems, &RenderStyle::initialAlignSelf>::createHandler());
     2527    setPropertyHandler(CSSPropertyFlexBasis, ApplyPropertyLength<&RenderStyle::flexBasis, &RenderStyle::setFlexBasis, &RenderStyle::initialFlexBasis, AutoEnabled>::createHandler());
     2528    setPropertyHandler(CSSPropertyFlexDirection, ApplyPropertyDefault<EFlexDirection, &RenderStyle::flexDirection, EFlexDirection, &RenderStyle::setFlexDirection, EFlexDirection, &RenderStyle::initialFlexDirection>::createHandler());
     2529    setPropertyHandler(CSSPropertyFlexGrow, ApplyPropertyDefault<float, &RenderStyle::flexGrow, float, &RenderStyle::setFlexGrow, float, &RenderStyle::initialFlexGrow>::createHandler());
     2530    setPropertyHandler(CSSPropertyFlexShrink, ApplyPropertyDefault<float, &RenderStyle::flexShrink, float, &RenderStyle::setFlexShrink, float, &RenderStyle::initialFlexShrink>::createHandler());
     2531    setPropertyHandler(CSSPropertyFlexWrap, ApplyPropertyDefault<EFlexWrap, &RenderStyle::flexWrap, EFlexWrap, &RenderStyle::setFlexWrap, EFlexWrap, &RenderStyle::initialFlexWrap>::createHandler());
     2532    setPropertyHandler(CSSPropertyJustifyContent, ApplyPropertyDefault<EJustifyContent, &RenderStyle::justifyContent, EJustifyContent, &RenderStyle::setJustifyContent, EJustifyContent, &RenderStyle::initialJustifyContent>::createHandler());
     2533    setPropertyHandler(CSSPropertyOrder, ApplyPropertyDefault<int, &RenderStyle::order, int, &RenderStyle::setOrder, int, &RenderStyle::initialOrder>::createHandler());
    25342534#if ENABLE(CSS_REGIONS)
    25352535    setPropertyHandler(CSSPropertyWebkitFlowFrom, ApplyPropertyString<MapNoneToNull, &RenderStyle::regionThread, &RenderStyle::setRegionThread, &RenderStyle::initialRegionThread>::createHandler());
  • trunk/Source/WebCore/css/StyleProperties.cpp

    r169349 r173572  
    154154    case CSSPropertyWebkitColumns:
    155155        return getShorthandValue(webkitColumnsShorthand());
    156     case CSSPropertyWebkitFlex:
    157         return getShorthandValue(webkitFlexShorthand());
    158     case CSSPropertyWebkitFlexFlow:
    159         return getShorthandValue(webkitFlexFlowShorthand());
     156    case CSSPropertyFlex:
     157        return getShorthandValue(flexShorthand());
     158    case CSSPropertyFlexFlow:
     159        return getShorthandValue(flexFlowShorthand());
    160160#if ENABLE(CSS_GRID_LAYOUT)
    161161    case CSSPropertyWebkitGridArea:
     
    894894            shorthandPropertyID = CSSPropertyWebkitAnimation;
    895895            break;
    896         case CSSPropertyWebkitFlexDirection:
    897         case CSSPropertyWebkitFlexWrap:
    898             shorthandPropertyID = CSSPropertyWebkitFlexFlow;
    899             break;
    900         case CSSPropertyWebkitFlexBasis:
    901         case CSSPropertyWebkitFlexGrow:
    902         case CSSPropertyWebkitFlexShrink:
    903             shorthandPropertyID = CSSPropertyWebkitFlex;
     896        case CSSPropertyFlexDirection:
     897        case CSSPropertyFlexWrap:
     898            shorthandPropertyID = CSSPropertyFlexFlow;
     899            break;
     900        case CSSPropertyFlexBasis:
     901        case CSSPropertyFlexGrow:
     902        case CSSPropertyFlexShrink:
     903            shorthandPropertyID = CSSPropertyFlex;
    904904            break;
    905905        case CSSPropertyWebkitMaskPositionX:
  • trunk/Source/WebCore/css/StylePropertyShorthand.cpp

    r169349 r173572  
    334334}
    335335
    336 StylePropertyShorthand webkitFlexFlowShorthand()
    337 {
    338     static const CSSPropertyID flexFlowProperties[] = { CSSPropertyWebkitFlexDirection, CSSPropertyWebkitFlexWrap };
    339     return StylePropertyShorthand(CSSPropertyWebkitFlexFlow, flexFlowProperties, WTF_ARRAY_LENGTH(flexFlowProperties));
    340 }
    341 
    342 StylePropertyShorthand webkitFlexShorthand()
    343 {
    344     static const CSSPropertyID flexProperties[] = { CSSPropertyWebkitFlexGrow, CSSPropertyWebkitFlexShrink, CSSPropertyWebkitFlexBasis };
    345     return StylePropertyShorthand(CSSPropertyWebkitFlex, flexProperties, WTF_ARRAY_LENGTH(flexProperties));
     336StylePropertyShorthand flexFlowShorthand()
     337{
     338    static const CSSPropertyID flexFlowProperties[] = { CSSPropertyFlexDirection, CSSPropertyFlexWrap };
     339    return StylePropertyShorthand(CSSPropertyFlexFlow, flexFlowProperties, WTF_ARRAY_LENGTH(flexFlowProperties));
     340}
     341
     342StylePropertyShorthand flexShorthand()
     343{
     344    static const CSSPropertyID flexProperties[] = { CSSPropertyFlexGrow, CSSPropertyFlexShrink, CSSPropertyFlexBasis };
     345    return StylePropertyShorthand(CSSPropertyFlex, flexProperties, WTF_ARRAY_LENGTH(flexProperties));
    346346}
    347347
     
    574574    case CSSPropertyWebkitColumnRule:
    575575        return webkitColumnRuleShorthand();
    576     case CSSPropertyWebkitFlex:
    577         return webkitFlexShorthand();
    578     case CSSPropertyWebkitFlexFlow:
    579         return webkitFlexFlowShorthand();
     576    case CSSPropertyFlex:
     577        return flexShorthand();
     578    case CSSPropertyFlexFlow:
     579        return flexFlowShorthand();
    580580#if ENABLE(CSS_GRID_LAYOUT)
    581581    case CSSPropertyWebkitGridArea:
     
    771771    case CSSPropertyWebkitColumnRuleColor:
    772772        return makeVector(webkitColumnRuleShorthand());
    773     case CSSPropertyWebkitFlexGrow:
    774     case CSSPropertyWebkitFlexShrink:
    775     case CSSPropertyWebkitFlexBasis:
    776         return makeVector(webkitFlexShorthand());
    777     case CSSPropertyWebkitFlexDirection:
    778     case CSSPropertyWebkitFlexWrap:
    779         return makeVector(webkitFlexFlowShorthand());
     773    case CSSPropertyFlexGrow:
     774    case CSSPropertyFlexShrink:
     775    case CSSPropertyFlexBasis:
     776        return makeVector(flexShorthand());
     777    case CSSPropertyFlexDirection:
     778    case CSSPropertyFlexWrap:
     779        return makeVector(flexFlowShorthand());
    780780#if ENABLE(CSS_GRID_LAYOUT)
    781781    case CSSPropertyWebkitGridColumnStart:
  • trunk/Source/WebCore/css/StylePropertyShorthand.h

    r169349 r173572  
    8282StylePropertyShorthand borderWidthShorthand();
    8383StylePropertyShorthand listStyleShorthand();
     84StylePropertyShorthand flexFlowShorthand();
     85StylePropertyShorthand flexShorthand();
    8486StylePropertyShorthand fontShorthand();
    8587StylePropertyShorthand heightShorthand();
     
    98100StylePropertyShorthand webkitColumnsShorthand();
    99101StylePropertyShorthand webkitColumnRuleShorthand();
    100 StylePropertyShorthand webkitFlexFlowShorthand();
    101 StylePropertyShorthand webkitFlexShorthand();
    102102StylePropertyShorthand webkitGridShorthand();
    103103StylePropertyShorthand webkitGridTemplateShorthand();
  • trunk/Source/WebCore/css/StyleResolver.cpp

    r173571 r173572  
    10661066    case BOX:
    10671067    case FLEX:
     1068    case WEBKIT_FLEX:
    10681069#if ENABLE(CSS_GRID_LAYOUT)
    10691070    case GRID:
     
    10811082        return BOX;
    10821083    case INLINE_FLEX:
     1084    case WEBKIT_INLINE_FLEX:
    10831085        return FLEX;
    10841086#if ENABLE(CSS_GRID_LAYOUT)
     
    23232325    case CSSPropertyWebkitColumns:
    23242326    case CSSPropertyWebkitColumnRule:
    2325     case CSSPropertyWebkitFlex:
    2326     case CSSPropertyWebkitFlexFlow:
     2327    case CSSPropertyFlex:
     2328    case CSSPropertyFlexFlow:
    23272329#if ENABLE(CSS_GRID_LAYOUT)
    23282330    case CSSPropertyWebkitGridTemplate:
     
    28382840    }
    28392841#endif /* ENABLE(CSS_GRID_LAYOUT) */
    2840     case CSSPropertyWebkitJustifySelf: {
     2842    case CSSPropertyJustifySelf: {
    28412843        HANDLE_INHERIT_AND_INITIAL(justifySelf, JustifySelf);
    28422844        CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
     
    31083110    case CSSPropertyWebkitCursorVisibility:
    31093111#endif
    3110     case CSSPropertyWebkitAlignContent:
    3111     case CSSPropertyWebkitAlignItems:
    3112     case CSSPropertyWebkitAlignSelf:
    3113     case CSSPropertyWebkitFlexBasis:
    3114     case CSSPropertyWebkitFlexDirection:
    3115     case CSSPropertyWebkitFlexGrow:
    3116     case CSSPropertyWebkitFlexShrink:
    3117     case CSSPropertyWebkitFlexWrap:
    3118     case CSSPropertyWebkitJustifyContent:
    3119     case CSSPropertyWebkitOrder:
     3112    case CSSPropertyAlignContent:
     3113    case CSSPropertyAlignItems:
     3114    case CSSPropertyAlignSelf:
     3115    case CSSPropertyFlexBasis:
     3116    case CSSPropertyFlexDirection:
     3117    case CSSPropertyFlexGrow:
     3118    case CSSPropertyFlexShrink:
     3119    case CSSPropertyFlexWrap:
     3120    case CSSPropertyJustifyContent:
     3121    case CSSPropertyOrder:
    31203122#if ENABLE(CSS_REGIONS)
    31213123    case CSSPropertyWebkitFlowFrom:
  • trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp

    r173268 r173572  
    984984class PropertyWrapperFlex : public AnimationPropertyWrapperBase {
    985985public:
    986     PropertyWrapperFlex() : AnimationPropertyWrapperBase(CSSPropertyWebkitFlex)
     986    PropertyWrapperFlex()
     987        : AnimationPropertyWrapperBase(CSSPropertyFlex)
    987988    {
    988989    }
  • trunk/Source/WebCore/rendering/RenderElement.cpp

    r173268 r173572  
    188188    case FLEX:
    189189    case INLINE_FLEX:
     190    case WEBKIT_FLEX:
     191    case WEBKIT_INLINE_FLEX:
    190192        return createRenderer<RenderFlexibleBox>(element, WTF::move(style));
    191193#if ENABLE(CSS_GRID_LAYOUT)
  • trunk/Source/WebCore/rendering/style/RenderStyleConstants.h

    r172861 r173572  
    475475    TABLE_COLUMN_GROUP, TABLE_COLUMN, TABLE_CELL,
    476476    TABLE_CAPTION, BOX, INLINE_BOX,
    477     FLEX, INLINE_FLEX,
     477    FLEX, WEBKIT_FLEX, INLINE_FLEX, WEBKIT_INLINE_FLEX,
    478478#if ENABLE(CSS_GRID_LAYOUT)
    479479    GRID, INLINE_GRID,
Note: See TracChangeset for help on using the changeset viewer.