Changeset 173572 in webkit
- Timestamp:
- Sep 12, 2014 1:46:05 PM (10 years ago)
- Location:
- trunk
- Files:
-
- 27 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r173571 r173572 1 2014-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 1 26 2014-09-12 Yusuke Suzuki <utatane.tea@gmail.com> 2 27 -
trunk/LayoutTests/css3/flexbox/display-flexbox-set-get-expected.txt
r117385 r173572 5 5 6 6 Test getting |display| set through CSS 7 PASS getComputedStyle(flexboxElement, '').getPropertyValue('display') is ' -webkit-flex'8 PASS getComputedStyle(inlineFlexboxElement, '').getPropertyValue('display') is ' -webkit-inline-flex'7 PASS getComputedStyle(flexboxElement, '').getPropertyValue('display') is 'flex' 8 PASS getComputedStyle(inlineFlexboxElement, '').getPropertyValue('display') is 'inline-flex' 9 9 10 10 Test getting and setting display through JS 11 11 PASS getComputedStyle(element, '').getPropertyValue('display') is 'block' 12 PASS getComputedStyle(element, '').getPropertyValue('display') is ' -webkit-flex'12 PASS getComputedStyle(element, '').getPropertyValue('display') is 'flex' 13 13 PASS getComputedStyle(element, '').getPropertyValue('display') is 'block' 14 PASS getComputedStyle(element, '').getPropertyValue('display') is ' -webkit-inline-flex'14 PASS getComputedStyle(element, '').getPropertyValue('display') is 'inline-flex' 15 15 PASS successfullyParsed is true 16 16 -
trunk/LayoutTests/css3/flexbox/display-flexbox-set-get.html
r155275 r173572 16 16 debug("Test getting |display| set through CSS"); 17 17 var flexboxElement = document.getElementById("flexbox"); 18 shouldBe("getComputedStyle(flexboxElement, '').getPropertyValue('display')", "' -webkit-flex'");18 shouldBe("getComputedStyle(flexboxElement, '').getPropertyValue('display')", "'flex'"); 19 19 var inlineFlexboxElement = document.getElementById("flexboxInline"); 20 shouldBe("getComputedStyle(inlineFlexboxElement, '').getPropertyValue('display')", "' -webkit-inline-flex'");20 shouldBe("getComputedStyle(inlineFlexboxElement, '').getPropertyValue('display')", "'inline-flex'"); 21 21 22 22 debug(""); … … 26 26 shouldBe("getComputedStyle(element, '').getPropertyValue('display')", "'block'"); 27 27 element.style.display = "-webkit-flex"; 28 shouldBe("getComputedStyle(element, '').getPropertyValue('display')", "' -webkit-flex'");28 shouldBe("getComputedStyle(element, '').getPropertyValue('display')", "'flex'"); 29 29 30 30 element = document.createElement("div"); … … 32 32 shouldBe("getComputedStyle(element, '').getPropertyValue('display')", "'block'"); 33 33 element.style.display = "-webkit-inline-flex"; 34 shouldBe("getComputedStyle(element, '').getPropertyValue('display')", "' -webkit-inline-flex'");34 shouldBe("getComputedStyle(element, '').getPropertyValue('display')", "'inline-flex'"); 35 35 </script> 36 36 <script src="../../resources/js-test-post.js"></script> -
trunk/LayoutTests/css3/flexbox/flexitem.html
r168350 r173572 72 72 <div data-expected-display="block" data-expected-width="100" style="display: inline-block;"></div> 73 73 <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> 75 75 <div data-expected-display="block" data-expected-width="100" style="display: table-cell"></div> 76 76 <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 35 35 36 36 <!-- 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> 39 39 <div data-expected-display="block" data-offset-x="50" data-offset-y="150" style="display: -webkit-inline-block"></div> 40 40 <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 144 144 -webkit-column-span: none; 145 145 -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;146 align-content: stretch; 147 align-items: stretch; 148 align-self: stretch; 149 flex-direction: row; 150 flex-wrap: nowrap; 151 justify-content: flex-start; 152 152 -webkit-font-kerning: auto; 153 153 -webkit-font-smoothing: auto; … … 194 194 -webkit-mask-size: auto; 195 195 -webkit-nbsp-mode: normal; 196 -webkit-order: 0;196 order: 0; 197 197 -webkit-perspective: none; 198 198 -webkit-perspective-origin: 392px 288px; -
trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
r172711 r173572 143 143 -webkit-column-span: none 144 144 -webkit-column-width: auto 145 -webkit-align-content: stretch146 -webkit-align-items: stretch147 -webkit-align-self: stretch148 -webkit-flex-direction: row149 -webkit-flex-wrap: nowrap150 -webkit-justify-content: flex-start145 align-content: stretch 146 align-items: stretch 147 align-self: stretch 148 flex-direction: row 149 flex-wrap: nowrap 150 justify-content: flex-start 151 151 -webkit-font-kerning: auto 152 152 -webkit-font-smoothing: auto … … 193 193 -webkit-mask-size: auto 194 194 -webkit-nbsp-mode: normal 195 -webkit-order: 0195 order: 0 196 196 -webkit-perspective: none 197 197 -webkit-perspective-origin: 50% 50% -
trunk/LayoutTests/fast/css/getComputedStyle/resources/property-names.js
r164719 r173572 1 1 // We only test properties that are exposed in all ports. 2 2 var 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, 6 6 "-webkit-animation-delay": true, 7 7 "-webkit-animation-direction": true, … … 45 45 "-webkit-column-span": true, 46 46 "-webkit-column-width": true, 47 " -webkit-flex-direction": true,48 " -webkit-flex-wrap": true,47 "flex-direction": true, 48 "flex-wrap": true, 49 49 "-webkit-font-kerning": true, 50 50 "-webkit-font-smoothing": true, … … 65 65 "-webkit-hyphenate-limit-lines": true, 66 66 "-webkit-hyphens": true, 67 " -webkit-justify-content": true,67 "justify-content": true, 68 68 "-webkit-line-align": true, 69 69 "-webkit-line-box-contain": true, … … 94 94 "-webkit-mask-size": true, 95 95 "-webkit-nbsp-mode": true, 96 " -webkit-order": true,96 "order": true, 97 97 "-webkit-perspective": true, 98 98 "-webkit-perspective-origin": true, -
trunk/LayoutTests/fast/css/inherit-initial-shorthand-values-expected.txt
r135848 r173572 25 25 PASS test('webkit-columns') is "inherit, initial" 26 26 PASS test('webkit-column-rule') is "inherit, initial" 27 PASS test(' webkit-flex-flow') is "inherit, initial"28 PASS test(' webkit-flex') is "inherit, initial"27 PASS test('flex-flow') is "inherit, initial" 28 PASS test('flex') is "inherit, initial" 29 29 PASS test('webkit-marginCollapse') is "inherit, initial" 30 30 PASS test('webkit-marquee') is "inherit, initial" -
trunk/LayoutTests/fast/css/inherit-initial-shorthand-values.html
r155263 r173572 43 43 "webkit-columns", 44 44 "webkit-column-rule", 45 " webkit-flex-flow",46 " webkit-flex",45 "flex-flow", 46 "flex", 47 47 "webkit-marginCollapse", 48 48 "webkit-marquee", -
trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt
r172711 r173572 285 285 rect: style.getPropertyValue(-webkit-column-width) : auto 286 286 rect: style.getPropertyCSSValue(-webkit-column-width) : [object CSSPrimitiveValue] 287 rect: style.getPropertyValue( -webkit-align-content) : stretch288 rect: style.getPropertyCSSValue( -webkit-align-content) : [object CSSPrimitiveValue]289 rect: style.getPropertyValue( -webkit-align-items) : stretch290 rect: style.getPropertyCSSValue( -webkit-align-items) : [object CSSPrimitiveValue]291 rect: style.getPropertyValue( -webkit-align-self) : stretch292 rect: style.getPropertyCSSValue( -webkit-align-self) : [object CSSPrimitiveValue]293 rect: style.getPropertyValue( -webkit-flex-direction) : row294 rect: style.getPropertyCSSValue( -webkit-flex-direction) : [object CSSPrimitiveValue]295 rect: style.getPropertyValue( -webkit-flex-wrap) : nowrap296 rect: style.getPropertyCSSValue( -webkit-flex-wrap) : [object CSSPrimitiveValue]297 rect: style.getPropertyValue( -webkit-justify-content) : flex-start298 rect: style.getPropertyCSSValue( -webkit-justify-content) : [object CSSPrimitiveValue]287 rect: style.getPropertyValue(align-content) : stretch 288 rect: style.getPropertyCSSValue(align-content) : [object CSSPrimitiveValue] 289 rect: style.getPropertyValue(align-items) : stretch 290 rect: style.getPropertyCSSValue(align-items) : [object CSSPrimitiveValue] 291 rect: style.getPropertyValue(align-self) : stretch 292 rect: style.getPropertyCSSValue(align-self) : [object CSSPrimitiveValue] 293 rect: style.getPropertyValue(flex-direction) : row 294 rect: style.getPropertyCSSValue(flex-direction) : [object CSSPrimitiveValue] 295 rect: style.getPropertyValue(flex-wrap) : nowrap 296 rect: style.getPropertyCSSValue(flex-wrap) : [object CSSPrimitiveValue] 297 rect: style.getPropertyValue(justify-content) : flex-start 298 rect: style.getPropertyCSSValue(justify-content) : [object CSSPrimitiveValue] 299 299 rect: style.getPropertyValue(-webkit-font-kerning) : auto 300 300 rect: style.getPropertyCSSValue(-webkit-font-kerning) : [object CSSPrimitiveValue] … … 385 385 rect: style.getPropertyValue(-webkit-nbsp-mode) : normal 386 386 rect: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue] 387 rect: style.getPropertyValue( -webkit-order) : 0388 rect: style.getPropertyCSSValue( -webkit-order) : [object CSSPrimitiveValue]387 rect: style.getPropertyValue(order) : 0 388 rect: style.getPropertyCSSValue(order) : [object CSSPrimitiveValue] 389 389 rect: style.getPropertyValue(-webkit-perspective) : none 390 390 rect: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue] … … 797 797 g: style.getPropertyValue(-webkit-column-width) : auto 798 798 g: style.getPropertyCSSValue(-webkit-column-width) : [object CSSPrimitiveValue] 799 g: style.getPropertyValue( -webkit-align-content) : stretch800 g: style.getPropertyCSSValue( -webkit-align-content) : [object CSSPrimitiveValue]801 g: style.getPropertyValue( -webkit-align-items) : stretch802 g: style.getPropertyCSSValue( -webkit-align-items) : [object CSSPrimitiveValue]803 g: style.getPropertyValue( -webkit-align-self) : stretch804 g: style.getPropertyCSSValue( -webkit-align-self) : [object CSSPrimitiveValue]805 g: style.getPropertyValue( -webkit-flex-direction) : row806 g: style.getPropertyCSSValue( -webkit-flex-direction) : [object CSSPrimitiveValue]807 g: style.getPropertyValue( -webkit-flex-wrap) : nowrap808 g: style.getPropertyCSSValue( -webkit-flex-wrap) : [object CSSPrimitiveValue]809 g: style.getPropertyValue( -webkit-justify-content) : flex-start810 g: style.getPropertyCSSValue( -webkit-justify-content) : [object CSSPrimitiveValue]799 g: style.getPropertyValue(align-content) : stretch 800 g: style.getPropertyCSSValue(align-content) : [object CSSPrimitiveValue] 801 g: style.getPropertyValue(align-items) : stretch 802 g: style.getPropertyCSSValue(align-items) : [object CSSPrimitiveValue] 803 g: style.getPropertyValue(align-self) : stretch 804 g: style.getPropertyCSSValue(align-self) : [object CSSPrimitiveValue] 805 g: style.getPropertyValue(flex-direction) : row 806 g: style.getPropertyCSSValue(flex-direction) : [object CSSPrimitiveValue] 807 g: style.getPropertyValue(flex-wrap) : nowrap 808 g: style.getPropertyCSSValue(flex-wrap) : [object CSSPrimitiveValue] 809 g: style.getPropertyValue(justify-content) : flex-start 810 g: style.getPropertyCSSValue(justify-content) : [object CSSPrimitiveValue] 811 811 g: style.getPropertyValue(-webkit-font-kerning) : auto 812 812 g: style.getPropertyCSSValue(-webkit-font-kerning) : [object CSSPrimitiveValue] … … 897 897 g: style.getPropertyValue(-webkit-nbsp-mode) : normal 898 898 g: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue] 899 g: style.getPropertyValue( -webkit-order) : 0900 g: style.getPropertyCSSValue( -webkit-order) : [object CSSPrimitiveValue]899 g: style.getPropertyValue(order) : 0 900 g: style.getPropertyCSSValue(order) : [object CSSPrimitiveValue] 901 901 g: style.getPropertyValue(-webkit-perspective) : none 902 902 g: 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,02 PASS - " -webkit-flex" property for "column1" element at 0.5s saw something close to: 0.5,0,103 PASS - " -webkit-flex" property for "negative1" element at 0.5s saw something close to: 1,0.5,754 PASS - " -webkit-flex" property for "no-flex1" element at 0.5s saw something close to: 0.5,0,01 PASS - "flex" property for "row1" element at 0.5s saw something close to: 2,0,0 2 PASS - "flex" property for "column1" element at 0.5s saw something close to: 0.5,0,10 3 PASS - "flex" property for "negative1" element at 0.5s saw something close to: 1,0.5,75 4 PASS - "flex" property for "no-flex1" element at 0.5s saw something close to: 0.5,0,0 5 5 -
trunk/LayoutTests/transitions/flex-transitions.html
r119191 r173572 21 21 22 22 #flex-row div { 23 -webkit-flex: 1 0 0px;23 flex: 1 0 0px; 24 24 } 25 25 .final #row1 { 26 -webkit-flex: 3 0 0px;26 flex: 3 0 0px; 27 27 } 28 28 29 29 #flex-column { 30 -webkit-flex-direction: column;30 flex-direction: column; 31 31 } 32 32 #flex-column div { 33 -webkit-flex: 1 0 0px;33 flex: 1 0 0px; 34 34 } 35 35 .final #column1 { 36 -webkit-flex: 0 0 20px;36 flex: 0 0 20px; 37 37 } 38 38 39 39 #flex-negative div { 40 -webkit-flex: 1 1 50px;40 flex: 1 1 50px; 41 41 } 42 42 .final #negative1 { 43 -webkit-flex: 1 100px;43 flex: 1 100px; 44 44 } 45 45 … … 57 57 const expectedValues = [ 58 58 // [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], 63 63 ]; 64 64 -
trunk/Source/WebCore/ChangeLog
r173571 r173572 1 2014-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 1 63 2014-09-12 Yusuke Suzuki <utatane.tea@gmail.com> 2 64 -
trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
r173499 r173572 281 281 CSSPropertyWebkitDashboardRegion, 282 282 #endif 283 CSSProperty WebkitAlignContent,284 CSSProperty WebkitAlignItems,285 CSSProperty WebkitAlignSelf,286 CSSProperty WebkitFlexBasis,287 CSSProperty WebkitFlexGrow,288 CSSProperty WebkitFlexShrink,289 CSSProperty WebkitFlexDirection,290 CSSProperty WebkitFlexWrap,291 CSSProperty WebkitJustifyContent,292 CSSProperty WebkitJustifySelf,283 CSSPropertyAlignContent, 284 CSSPropertyAlignItems, 285 CSSPropertyAlignSelf, 286 CSSPropertyFlexBasis, 287 CSSPropertyFlexGrow, 288 CSSPropertyFlexShrink, 289 CSSPropertyFlexDirection, 290 CSSPropertyFlexWrap, 291 CSSPropertyJustifyContent, 292 CSSPropertyJustifySelf, 293 293 CSSPropertyWebkitFilter, 294 294 CSSPropertyWebkitFontKerning, … … 341 341 CSSPropertyWebkitMaskSourceType, 342 342 CSSPropertyWebkitNbspMode, 343 CSSProperty WebkitOrder,343 CSSPropertyOrder, 344 344 #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING) 345 345 CSSPropertyWebkitOverflowScrolling, … … 2027 2027 case CSSPropertyEmptyCells: 2028 2028 return cssValuePool().createValue(style->emptyCells()); 2029 case CSSProperty WebkitAlignContent:2029 case CSSPropertyAlignContent: 2030 2030 return cssValuePool().createValue(style->alignContent()); 2031 case CSSProperty WebkitAlignItems:2031 case CSSPropertyAlignItems: 2032 2032 return cssValuePool().createValue(style->alignItems()); 2033 case CSSProperty WebkitAlignSelf:2033 case CSSPropertyAlignSelf: 2034 2034 if (style->alignSelf() == AlignAuto) { 2035 2035 Node* parent = styledNode->parentNode(); … … 2039 2039 } 2040 2040 return cssValuePool().createValue(style->alignSelf()); 2041 case CSSProperty WebkitFlex:2042 return getCSSPropertyValuesForShorthandProperties( webkitFlexShorthand());2043 case CSSProperty WebkitFlexBasis:2041 case CSSPropertyFlex: 2042 return getCSSPropertyValuesForShorthandProperties(flexShorthand()); 2043 case CSSPropertyFlexBasis: 2044 2044 return cssValuePool().createValue(style->flexBasis()); 2045 case CSSProperty WebkitFlexDirection:2045 case CSSPropertyFlexDirection: 2046 2046 return cssValuePool().createValue(style->flexDirection()); 2047 case CSSProperty WebkitFlexFlow:2048 return getCSSPropertyValuesForShorthandProperties( webkitFlexFlowShorthand());2049 case CSSProperty WebkitFlexGrow:2047 case CSSPropertyFlexFlow: 2048 return getCSSPropertyValuesForShorthandProperties(flexFlowShorthand()); 2049 case CSSPropertyFlexGrow: 2050 2050 return cssValuePool().createValue(style->flexGrow()); 2051 case CSSProperty WebkitFlexShrink:2051 case CSSPropertyFlexShrink: 2052 2052 return cssValuePool().createValue(style->flexShrink()); 2053 case CSSProperty WebkitFlexWrap:2053 case CSSPropertyFlexWrap: 2054 2054 return cssValuePool().createValue(style->flexWrap()); 2055 case CSSProperty WebkitJustifyContent:2055 case CSSPropertyJustifyContent: 2056 2056 return cssValuePool().createValue(style->justifyContent()); 2057 case CSSProperty WebkitJustifySelf: {2057 case CSSPropertyJustifySelf: { 2058 2058 RefPtr<CSSValueList> result = CSSValueList::createSpaceSeparated(); 2059 2059 result->append(CSSPrimitiveValue::create(style->justifySelf())); … … 2062 2062 return result.release(); 2063 2063 } 2064 case CSSProperty WebkitOrder:2064 case CSSPropertyOrder: 2065 2065 return cssValuePool().createValue(style->order(), CSSPrimitiveValue::CSS_NUMBER); 2066 2066 case CSSPropertyFloat: -
trunk/Source/WebCore/css/CSSParser.cpp
r173499 r173572 680 680 // inline-table | table-row-group | table-header-group | table-footer-group | table-row | 681 681 // 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-grid682 // flex | -webkit-flex | inline-flex | -webkit-inline-flex | -webkit-grid | -webkit-inline-grid 683 683 if ((valueID >= CSSValueInline && valueID <= CSSValueWebkitInlineFlex) || valueID == CSSValueNone) 684 684 return true; … … 864 864 return true; 865 865 break; 866 case CSSProperty WebkitAlignContent:866 case CSSPropertyAlignContent: 867 867 // FIXME: Per CSS alignment, this property should accept an optional <overflow-position>. We should share this parsing code with 'justify-self'. 868 868 if (valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || valueID == CSSValueCenter || valueID == CSSValueSpaceBetween || valueID == CSSValueSpaceAround || valueID == CSSValueStretch) 869 869 return true; 870 870 break; 871 case CSSProperty WebkitAlignItems:871 case CSSPropertyAlignItems: 872 872 // FIXME: Per CSS alignment, this property should accept the same arguments as 'justify-self' so we should share its parsing code. 873 873 if (valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || valueID == CSSValueCenter || valueID == CSSValueBaseline || valueID == CSSValueStretch) 874 874 return true; 875 875 break; 876 case CSSProperty WebkitAlignSelf:876 case CSSPropertyAlignSelf: 877 877 // FIXME: Per CSS alignment, this property should accept the same arguments as 'justify-self' so we should share its parsing code. 878 878 if (valueID == CSSValueAuto || valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || valueID == CSSValueCenter || valueID == CSSValueBaseline || valueID == CSSValueStretch) 879 879 return true; 880 880 break; 881 case CSSProperty WebkitFlexDirection:881 case CSSPropertyFlexDirection: 882 882 if (valueID == CSSValueRow || valueID == CSSValueRowReverse || valueID == CSSValueColumn || valueID == CSSValueColumnReverse) 883 883 return true; 884 884 break; 885 case CSSProperty WebkitFlexWrap:885 case CSSPropertyFlexWrap: 886 886 if (valueID == CSSValueNowrap || valueID == CSSValueWrap || valueID == CSSValueWrapReverse) 887 887 return true; 888 888 break; 889 case CSSProperty WebkitJustifyContent:889 case CSSPropertyJustifyContent: 890 890 // FIXME: Per CSS alignment, this property should accept an optional <overflow-position>. We should share this parsing code with 'justify-self'. 891 891 if (valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || valueID == CSSValueCenter || valueID == CSSValueSpaceBetween || valueID == CSSValueSpaceAround) 892 892 return true; 893 893 break; 894 case CSSProperty WebkitJustifySelf:894 case CSSPropertyJustifySelf: 895 895 if (valueID == CSSValueAuto || valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || valueID == CSSValueCenter || valueID == CSSValueBaseline || valueID == CSSValueStretch) 896 896 return true; … … 1106 1106 case CSSPropertyWebkitColumnFill: 1107 1107 case CSSPropertyWebkitColumnRuleStyle: 1108 case CSSProperty WebkitAlignContent:1109 case CSSProperty WebkitAlignItems:1110 case CSSProperty WebkitAlignSelf:1111 case CSSProperty WebkitFlexDirection:1112 case CSSProperty WebkitFlexWrap:1113 case CSSProperty WebkitJustifyContent:1108 case CSSPropertyAlignContent: 1109 case CSSPropertyAlignItems: 1110 case CSSPropertyAlignSelf: 1111 case CSSPropertyFlexDirection: 1112 case CSSPropertyFlexWrap: 1113 case CSSPropertyJustifyContent: 1114 1114 case CSSPropertyWebkitFontKerning: 1115 1115 case CSSPropertyWebkitFontSmoothing: … … 2475 2475 break; 2476 2476 #endif 2477 case CSSProperty WebkitFlex: {2477 case CSSPropertyFlex: { 2478 2478 ShorthandScope scope(this, propId); 2479 2479 if (id == CSSValueNone) { 2480 addProperty(CSSProperty WebkitFlexGrow, cssValuePool().createValue(0, CSSPrimitiveValue::CSS_NUMBER), important);2481 addProperty(CSSProperty WebkitFlexShrink, cssValuePool().createValue(0, CSSPrimitiveValue::CSS_NUMBER), important);2482 addProperty(CSSProperty WebkitFlexBasis, 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); 2483 2483 return true; 2484 2484 } 2485 2485 return parseFlex(m_valueList.get(), important); 2486 2486 } 2487 case CSSProperty WebkitFlexBasis:2487 case CSSPropertyFlexBasis: 2488 2488 // FIXME: Support intrinsic dimensions too. 2489 2489 if (id == CSSValueAuto) … … 2492 2492 validPrimitive = (!id && validUnit(value, FLength | FPercent | FNonNeg)); 2493 2493 break; 2494 case CSSProperty WebkitFlexGrow:2495 case CSSProperty WebkitFlexShrink:2494 case CSSPropertyFlexGrow: 2495 case CSSPropertyFlexShrink: 2496 2496 validPrimitive = validUnit(value, FNumber | FNonNeg); 2497 2497 break; 2498 case CSSProperty WebkitOrder:2498 case CSSPropertyOrder: 2499 2499 if (validUnit(value, FInteger, CSSStrictMode)) { 2500 2500 // 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. … … 2616 2616 return false; 2617 2617 } 2618 case CSSProperty WebkitJustifySelf:2618 case CSSPropertyJustifySelf: 2619 2619 return parseJustifySelf(propId, important); 2620 2620 #if ENABLE(CSS_GRID_LAYOUT) … … 2861 2861 // <padding-width>{1,4} | inherit 2862 2862 return parse4Values(propId, paddingShorthand().properties(), important); 2863 case CSSProperty WebkitFlexFlow:2864 return parseShorthand(propId, webkitFlexFlowShorthand(), important);2863 case CSSPropertyFlexFlow: 2864 return parseShorthand(propId, flexFlowShorthand(), important); 2865 2865 case CSSPropertyFont: 2866 2866 // [ [ 'font-style' || 'font-variant' || 'font-weight' ]? 'font-size' [ / 'line-height' ]? … … 3012 3012 case CSSPropertyWebkitColumnFill: 3013 3013 case CSSPropertyWebkitColumnRuleStyle: 3014 case CSSProperty WebkitAlignContent:3015 case CSSProperty WebkitAlignItems:3016 case CSSProperty WebkitAlignSelf:3017 case CSSProperty WebkitFlexDirection:3018 case CSSProperty WebkitFlexWrap:3019 case CSSProperty WebkitJustifyContent:3014 case CSSPropertyAlignContent: 3015 case CSSPropertyAlignItems: 3016 case CSSPropertyAlignSelf: 3017 case CSSPropertyFlexDirection: 3018 case CSSPropertyFlexWrap: 3019 case CSSPropertyJustifyContent: 3020 3020 case CSSPropertyWebkitFontKerning: 3021 3021 case CSSPropertyWebkitFontSmoothing: … … 7365 7365 flexBasis = cssValuePool().createValue(0, CSSPrimitiveValue::CSS_PX); 7366 7366 7367 addProperty(CSSProperty WebkitFlexGrow, cssValuePool().createValue(clampToFloat(flexGrow), CSSPrimitiveValue::CSS_NUMBER), important);7368 addProperty(CSSProperty WebkitFlexShrink, cssValuePool().createValue(clampToFloat(flexShrink), CSSPrimitiveValue::CSS_NUMBER), important);7369 addProperty(CSSProperty WebkitFlexBasis, 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); 7370 7370 return true; 7371 7371 } -
trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h
r172861 r173572 1356 1356 break; 1357 1357 case FLEX: 1358 m_value.valueID = CSSValueWebkitFlex; 1358 case WEBKIT_FLEX: 1359 m_value.valueID = CSSValueFlex; 1359 1360 break; 1360 1361 case INLINE_FLEX: 1361 m_value.valueID = CSSValueWebkitInlineFlex; 1362 case WEBKIT_INLINE_FLEX: 1363 m_value.valueID = CSSValueInlineFlex; 1362 1364 break; 1363 1365 #if ENABLE(CSS_GRID_LAYOUT) … … 1384 1386 EDisplay display = static_cast<EDisplay>(m_value.valueID - CSSValueInline); 1385 1387 ASSERT(display >= INLINE && display <= NONE); 1388 if (display == WEBKIT_FLEX) 1389 return FLEX; 1390 if (display == WEBKIT_INLINE_FLEX) 1391 return INLINE_FLEX; 1386 1392 return display; 1387 1393 } -
trunk/Source/WebCore/css/CSSPropertyNames.in
r173499 r173572 294 294 #endif 295 295 -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 296 align-content 297 -webkit-align-content = align-content 298 align-items 299 -webkit-align-items = align-items 300 align-self 301 -webkit-align-self = align-self 302 flex 303 -webkit-flex = flex 304 flex-basis 305 -webkit-flex-basis = flex-basis 306 flex-direction 307 -webkit-flex-direction = flex-direction 308 flex-flow 309 -webkit-flex-flow = flex-flow 310 flex-grow 311 -webkit-flex-grow = flex-grow 312 flex-shrink 313 -webkit-flex-shrink = flex-shrink 314 flex-wrap 315 -webkit-flex-wrap = flex-wrap 316 justify-content 317 -webkit-justify-content = justify-content 318 justify-self 319 -webkit-justify-self = justify-self 308 320 -webkit-font-size-delta 309 321 #if defined(ENABLE_CSS_GRID_LAYOUT) && ENABLE_CSS_GRID_LAYOUT … … 378 390 -webkit-min-logical-height 379 391 -webkit-nbsp-mode [Inherited] 380 -webkit-order 392 order 393 -webkit-order = order 381 394 -webkit-padding-after 382 395 -webkit-padding-before -
trunk/Source/WebCore/css/CSSValueKeywords.in
r173217 r173572 359 359 -webkit-box 360 360 -webkit-inline-box 361 flex 361 362 -webkit-flex 363 inline-flex 362 364 -webkit-inline-flex 363 365 -webkit-grid -
trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp
r172861 r173572 2522 2522 setPropertyHandler(CSSPropertyWebkitCursorVisibility, ApplyPropertyDefault<CursorVisibility, &RenderStyle::cursorVisibility, CursorVisibility, &RenderStyle::setCursorVisibility, CursorVisibility, &RenderStyle::initialCursorVisibility>::createHandler()); 2523 2523 #endif 2524 setPropertyHandler(CSSProperty WebkitAlignContent, ApplyPropertyDefault<EAlignContent, &RenderStyle::alignContent, EAlignContent, &RenderStyle::setAlignContent, EAlignContent, &RenderStyle::initialAlignContent>::createHandler());2525 setPropertyHandler(CSSProperty WebkitAlignItems, ApplyPropertyDefault<EAlignItems, &RenderStyle::alignItems, EAlignItems, &RenderStyle::setAlignItems, EAlignItems, &RenderStyle::initialAlignItems>::createHandler());2526 setPropertyHandler(CSSProperty WebkitAlignSelf, ApplyPropertyDefault<EAlignItems, &RenderStyle::alignSelf, EAlignItems, &RenderStyle::setAlignSelf, EAlignItems, &RenderStyle::initialAlignSelf>::createHandler());2527 setPropertyHandler(CSSProperty WebkitFlexBasis, ApplyPropertyLength<&RenderStyle::flexBasis, &RenderStyle::setFlexBasis, &RenderStyle::initialFlexBasis, AutoEnabled>::createHandler());2528 setPropertyHandler(CSSProperty WebkitFlexDirection, ApplyPropertyDefault<EFlexDirection, &RenderStyle::flexDirection, EFlexDirection, &RenderStyle::setFlexDirection, EFlexDirection, &RenderStyle::initialFlexDirection>::createHandler());2529 setPropertyHandler(CSSProperty WebkitFlexGrow, ApplyPropertyDefault<float, &RenderStyle::flexGrow, float, &RenderStyle::setFlexGrow, float, &RenderStyle::initialFlexGrow>::createHandler());2530 setPropertyHandler(CSSProperty WebkitFlexShrink, ApplyPropertyDefault<float, &RenderStyle::flexShrink, float, &RenderStyle::setFlexShrink, float, &RenderStyle::initialFlexShrink>::createHandler());2531 setPropertyHandler(CSSProperty WebkitFlexWrap, ApplyPropertyDefault<EFlexWrap, &RenderStyle::flexWrap, EFlexWrap, &RenderStyle::setFlexWrap, EFlexWrap, &RenderStyle::initialFlexWrap>::createHandler());2532 setPropertyHandler(CSSProperty WebkitJustifyContent, ApplyPropertyDefault<EJustifyContent, &RenderStyle::justifyContent, EJustifyContent, &RenderStyle::setJustifyContent, EJustifyContent, &RenderStyle::initialJustifyContent>::createHandler());2533 setPropertyHandler(CSSProperty WebkitOrder, 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()); 2534 2534 #if ENABLE(CSS_REGIONS) 2535 2535 setPropertyHandler(CSSPropertyWebkitFlowFrom, ApplyPropertyString<MapNoneToNull, &RenderStyle::regionThread, &RenderStyle::setRegionThread, &RenderStyle::initialRegionThread>::createHandler()); -
trunk/Source/WebCore/css/StyleProperties.cpp
r169349 r173572 154 154 case CSSPropertyWebkitColumns: 155 155 return getShorthandValue(webkitColumnsShorthand()); 156 case CSSProperty WebkitFlex:157 return getShorthandValue( webkitFlexShorthand());158 case CSSProperty WebkitFlexFlow:159 return getShorthandValue( webkitFlexFlowShorthand());156 case CSSPropertyFlex: 157 return getShorthandValue(flexShorthand()); 158 case CSSPropertyFlexFlow: 159 return getShorthandValue(flexFlowShorthand()); 160 160 #if ENABLE(CSS_GRID_LAYOUT) 161 161 case CSSPropertyWebkitGridArea: … … 894 894 shorthandPropertyID = CSSPropertyWebkitAnimation; 895 895 break; 896 case CSSProperty WebkitFlexDirection:897 case CSSProperty WebkitFlexWrap:898 shorthandPropertyID = CSSProperty WebkitFlexFlow;899 break; 900 case CSSProperty WebkitFlexBasis:901 case CSSProperty WebkitFlexGrow:902 case CSSProperty WebkitFlexShrink:903 shorthandPropertyID = CSSProperty WebkitFlex;896 case CSSPropertyFlexDirection: 897 case CSSPropertyFlexWrap: 898 shorthandPropertyID = CSSPropertyFlexFlow; 899 break; 900 case CSSPropertyFlexBasis: 901 case CSSPropertyFlexGrow: 902 case CSSPropertyFlexShrink: 903 shorthandPropertyID = CSSPropertyFlex; 904 904 break; 905 905 case CSSPropertyWebkitMaskPositionX: -
trunk/Source/WebCore/css/StylePropertyShorthand.cpp
r169349 r173572 334 334 } 335 335 336 StylePropertyShorthand webkitFlexFlowShorthand()337 { 338 static const CSSPropertyID flexFlowProperties[] = { CSSProperty WebkitFlexDirection, CSSPropertyWebkitFlexWrap };339 return StylePropertyShorthand(CSSProperty WebkitFlexFlow, flexFlowProperties, WTF_ARRAY_LENGTH(flexFlowProperties));340 } 341 342 StylePropertyShorthand webkitFlexShorthand()343 { 344 static const CSSPropertyID flexProperties[] = { CSSProperty WebkitFlexGrow, CSSPropertyWebkitFlexShrink, CSSPropertyWebkitFlexBasis };345 return StylePropertyShorthand(CSSProperty WebkitFlex, flexProperties, WTF_ARRAY_LENGTH(flexProperties));336 StylePropertyShorthand flexFlowShorthand() 337 { 338 static const CSSPropertyID flexFlowProperties[] = { CSSPropertyFlexDirection, CSSPropertyFlexWrap }; 339 return StylePropertyShorthand(CSSPropertyFlexFlow, flexFlowProperties, WTF_ARRAY_LENGTH(flexFlowProperties)); 340 } 341 342 StylePropertyShorthand flexShorthand() 343 { 344 static const CSSPropertyID flexProperties[] = { CSSPropertyFlexGrow, CSSPropertyFlexShrink, CSSPropertyFlexBasis }; 345 return StylePropertyShorthand(CSSPropertyFlex, flexProperties, WTF_ARRAY_LENGTH(flexProperties)); 346 346 } 347 347 … … 574 574 case CSSPropertyWebkitColumnRule: 575 575 return webkitColumnRuleShorthand(); 576 case CSSProperty WebkitFlex:577 return webkitFlexShorthand();578 case CSSProperty WebkitFlexFlow:579 return webkitFlexFlowShorthand();576 case CSSPropertyFlex: 577 return flexShorthand(); 578 case CSSPropertyFlexFlow: 579 return flexFlowShorthand(); 580 580 #if ENABLE(CSS_GRID_LAYOUT) 581 581 case CSSPropertyWebkitGridArea: … … 771 771 case CSSPropertyWebkitColumnRuleColor: 772 772 return makeVector(webkitColumnRuleShorthand()); 773 case CSSProperty WebkitFlexGrow:774 case CSSProperty WebkitFlexShrink:775 case CSSProperty WebkitFlexBasis:776 return makeVector( webkitFlexShorthand());777 case CSSProperty WebkitFlexDirection:778 case CSSProperty WebkitFlexWrap: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()); 780 780 #if ENABLE(CSS_GRID_LAYOUT) 781 781 case CSSPropertyWebkitGridColumnStart: -
trunk/Source/WebCore/css/StylePropertyShorthand.h
r169349 r173572 82 82 StylePropertyShorthand borderWidthShorthand(); 83 83 StylePropertyShorthand listStyleShorthand(); 84 StylePropertyShorthand flexFlowShorthand(); 85 StylePropertyShorthand flexShorthand(); 84 86 StylePropertyShorthand fontShorthand(); 85 87 StylePropertyShorthand heightShorthand(); … … 98 100 StylePropertyShorthand webkitColumnsShorthand(); 99 101 StylePropertyShorthand webkitColumnRuleShorthand(); 100 StylePropertyShorthand webkitFlexFlowShorthand();101 StylePropertyShorthand webkitFlexShorthand();102 102 StylePropertyShorthand webkitGridShorthand(); 103 103 StylePropertyShorthand webkitGridTemplateShorthand(); -
trunk/Source/WebCore/css/StyleResolver.cpp
r173571 r173572 1066 1066 case BOX: 1067 1067 case FLEX: 1068 case WEBKIT_FLEX: 1068 1069 #if ENABLE(CSS_GRID_LAYOUT) 1069 1070 case GRID: … … 1081 1082 return BOX; 1082 1083 case INLINE_FLEX: 1084 case WEBKIT_INLINE_FLEX: 1083 1085 return FLEX; 1084 1086 #if ENABLE(CSS_GRID_LAYOUT) … … 2323 2325 case CSSPropertyWebkitColumns: 2324 2326 case CSSPropertyWebkitColumnRule: 2325 case CSSProperty WebkitFlex:2326 case CSSProperty WebkitFlexFlow:2327 case CSSPropertyFlex: 2328 case CSSPropertyFlexFlow: 2327 2329 #if ENABLE(CSS_GRID_LAYOUT) 2328 2330 case CSSPropertyWebkitGridTemplate: … … 2838 2840 } 2839 2841 #endif /* ENABLE(CSS_GRID_LAYOUT) */ 2840 case CSSProperty WebkitJustifySelf: {2842 case CSSPropertyJustifySelf: { 2841 2843 HANDLE_INHERIT_AND_INITIAL(justifySelf, JustifySelf); 2842 2844 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); … … 3108 3110 case CSSPropertyWebkitCursorVisibility: 3109 3111 #endif 3110 case CSSProperty WebkitAlignContent:3111 case CSSProperty WebkitAlignItems:3112 case CSSProperty WebkitAlignSelf:3113 case CSSProperty WebkitFlexBasis:3114 case CSSProperty WebkitFlexDirection:3115 case CSSProperty WebkitFlexGrow:3116 case CSSProperty WebkitFlexShrink:3117 case CSSProperty WebkitFlexWrap:3118 case CSSProperty WebkitJustifyContent:3119 case CSSProperty WebkitOrder: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: 3120 3122 #if ENABLE(CSS_REGIONS) 3121 3123 case CSSPropertyWebkitFlowFrom: -
trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp
r173268 r173572 984 984 class PropertyWrapperFlex : public AnimationPropertyWrapperBase { 985 985 public: 986 PropertyWrapperFlex() : AnimationPropertyWrapperBase(CSSPropertyWebkitFlex) 986 PropertyWrapperFlex() 987 : AnimationPropertyWrapperBase(CSSPropertyFlex) 987 988 { 988 989 } -
trunk/Source/WebCore/rendering/RenderElement.cpp
r173268 r173572 188 188 case FLEX: 189 189 case INLINE_FLEX: 190 case WEBKIT_FLEX: 191 case WEBKIT_INLINE_FLEX: 190 192 return createRenderer<RenderFlexibleBox>(element, WTF::move(style)); 191 193 #if ENABLE(CSS_GRID_LAYOUT) -
trunk/Source/WebCore/rendering/style/RenderStyleConstants.h
r172861 r173572 475 475 TABLE_COLUMN_GROUP, TABLE_COLUMN, TABLE_CELL, 476 476 TABLE_CAPTION, BOX, INLINE_BOX, 477 FLEX, INLINE_FLEX,477 FLEX, WEBKIT_FLEX, INLINE_FLEX, WEBKIT_INLINE_FLEX, 478 478 #if ENABLE(CSS_GRID_LAYOUT) 479 479 GRID, INLINE_GRID,
Note: See TracChangeset
for help on using the changeset viewer.