Changeset 108102 in webkit


Ignore:
Timestamp:
Feb 17, 2012 11:56:43 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

flex-wrap:nowrap should be flex-wrap:none
​https://bugs.webkit.org/show_bug.cgi?id=78772

As per the spec ​http://dev.w3.org/csswg/css3-flexbox/#flex-wrap0, flex-wrap:nowrap should be changed to flex-wrap:none.

Patch by Joe Thomas <​joethomas@motorola.com> on 2012-02-17
Reviewed by Ojan Vafai.

Source/WebCore:

  • css/CSSParser.cpp:

(WebCore::CSSParser::parseValue):

  • css/CSSPrimitiveValueMappings.h:

(WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
(WebCore::CSSPrimitiveValue::operator EFlexWrap):

  • css/CSSValueKeywords.in:
  • rendering/style/RenderStyle.h:
  • rendering/style/RenderStyleConstants.h:

LayoutTests:

  • css3/flexbox/css-properties-expected.txt:
  • css3/flexbox/script-tests/css-properties.js:
  • fast/css/getComputedStyle/computed-style-expected.txt:
  • fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
  • platform/chromium-mac-snowleopard/fast/css/getComputedStyle/computed-style-expected.txt:
  • platform/chromium-mac-snowleopard/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
  • platform/chromium-mac-snowleopard/svg/css/getComputedStyle-basic-expected.txt:
  • platform/chromium-win/fast/css/getComputedStyle/computed-style-expected.txt:
  • platform/chromium-win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
  • platform/chromium-win/svg/css/getComputedStyle-basic-expected.txt:
  • platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
  • svg/css/getComputedStyle-basic-expected.txt:
Location:
trunk
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r108098 r108102  
     12012-02-17  Joe Thomas  <joethomas@motorola.com>
     2
     3        flex-wrap:nowrap should be flex-wrap:none
     4        https://bugs.webkit.org/show_bug.cgi?id=78772
     5
     6        As per the spec http://dev.w3.org/csswg/css3-flexbox/#flex-wrap0, flex-wrap:nowrap should be changed to flex-wrap:none.
     7
     8        Reviewed by Ojan Vafai.
     9
     10        * css3/flexbox/css-properties-expected.txt:
     11        * css3/flexbox/script-tests/css-properties.js:
     12        * fast/css/getComputedStyle/computed-style-expected.txt:
     13        * fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
     14        * platform/chromium-mac-snowleopard/fast/css/getComputedStyle/computed-style-expected.txt:
     15        * platform/chromium-mac-snowleopard/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
     16        * platform/chromium-mac-snowleopard/svg/css/getComputedStyle-basic-expected.txt:
     17        * platform/chromium-win/fast/css/getComputedStyle/computed-style-expected.txt:
     18        * platform/chromium-win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
     19        * platform/chromium-win/svg/css/getComputedStyle-basic-expected.txt:
     20        * platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
     21        * svg/css/getComputedStyle-basic-expected.txt:
     22
    1232012-02-17  Julien Chaffraix  <jchaffraix@webkit.org>
    224

  • trunk/LayoutTests/css3/flexbox/css-properties-expected.txt

    r107833 r108102  
    8888PASS window.getComputedStyle(flexbox, null).webkitFlexDirection is "column-reverse"
    8989PASS flexbox.style.webkitFlexWrap is ""
    90 PASS window.getComputedStyle(flexbox, null).webkitFlexWrap is "nowrap"
     90PASS window.getComputedStyle(flexbox, null).webkitFlexWrap is "none"
    9191PASS flexbox.style.webkitFlexWrap is ""
    92 PASS flexbox.style.webkitFlexWrap is "nowrap"
    93 PASS window.getComputedStyle(flexbox, null).webkitFlexWrap is "nowrap"
     92PASS flexbox.style.webkitFlexWrap is "none"
     93PASS window.getComputedStyle(flexbox, null).webkitFlexWrap is "none"
    9494PASS flexbox.style.webkitFlexWrap is "wrap"
    9595PASS window.getComputedStyle(flexbox, null).webkitFlexWrap is "wrap"
    … …  
    9797PASS window.getComputedStyle(flexbox, null).webkitFlexWrap is "wrap-reverse"
    9898PASS flexbox.style.webkitFlexFlow is ""
    99 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row nowrap"
     99PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row none"
    100100PASS flexbox.style.webkitFlexFlow is ""
    101101PASS flexbox.style.webkitFlexFlow is ""
    102 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row nowrap"
     102PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row none"
    103103PASS flexbox.style.webkitFlexFlow is ""
    104 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row nowrap"
    105 PASS flexbox.style.webkitFlexFlow is "nowrap"
    106 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row nowrap"
    107 PASS flexbox.style.webkitFlexFlow is "nowrap"
    108 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row nowrap"
     104PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row none"
     105PASS flexbox.style.webkitFlexFlow is "none"
     106PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row none"
     107PASS flexbox.style.webkitFlexFlow is "none"
     108PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row none"
    109109PASS flexbox.style.webkitFlexFlow is "wrap"
    110110PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row wrap"
    … …  
    116116PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row wrap-reverse"
    117117PASS flexbox.style.webkitFlexFlow is "row"
    118 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row nowrap"
     118PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row none"
    119119PASS flexbox.style.webkitFlexFlow is "row"
    120 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row nowrap"
    121 PASS flexbox.style.webkitFlexFlow is "row nowrap"
    122 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row nowrap"
    123 PASS flexbox.style.webkitFlexFlow is "row nowrap"
    124 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row nowrap"
     120PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row none"
     121PASS flexbox.style.webkitFlexFlow is "row none"
     122PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row none"
     123PASS flexbox.style.webkitFlexFlow is "row none"
     124PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row none"
    125125PASS flexbox.style.webkitFlexFlow is "row wrap"
    126126PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row wrap"
    … …  
    132132PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row wrap-reverse"
    133133PASS flexbox.style.webkitFlexFlow is "row-reverse"
    134 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row-reverse nowrap"
     134PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row-reverse none"
    135135PASS flexbox.style.webkitFlexFlow is "row-reverse"
    136 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row-reverse nowrap"
    137 PASS flexbox.style.webkitFlexFlow is "row-reverse nowrap"
    138 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row-reverse nowrap"
    139 PASS flexbox.style.webkitFlexFlow is "row-reverse nowrap"
    140 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row-reverse nowrap"
     136PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row-reverse none"
     137PASS flexbox.style.webkitFlexFlow is "row-reverse none"
     138PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row-reverse none"
     139PASS flexbox.style.webkitFlexFlow is "row-reverse none"
     140PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row-reverse none"
    141141PASS flexbox.style.webkitFlexFlow is "row-reverse wrap"
    142142PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row-reverse wrap"
    … …  
    148148PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row-reverse wrap-reverse"
    149149PASS flexbox.style.webkitFlexFlow is "column"
    150 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column nowrap"
     150PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column none"
    151151PASS flexbox.style.webkitFlexFlow is "column"
    152 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column nowrap"
    153 PASS flexbox.style.webkitFlexFlow is "column nowrap"
    154 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column nowrap"
    155 PASS flexbox.style.webkitFlexFlow is "column nowrap"
    156 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column nowrap"
     152PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column none"
     153PASS flexbox.style.webkitFlexFlow is "column none"
     154PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column none"
     155PASS flexbox.style.webkitFlexFlow is "column none"
     156PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column none"
    157157PASS flexbox.style.webkitFlexFlow is "column wrap"
    158158PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column wrap"
    … …  
    164164PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column wrap-reverse"
    165165PASS flexbox.style.webkitFlexFlow is "column-reverse"
    166 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column-reverse nowrap"
     166PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column-reverse none"
    167167PASS flexbox.style.webkitFlexFlow is "column-reverse"
    168 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column-reverse nowrap"
    169 PASS flexbox.style.webkitFlexFlow is "column-reverse nowrap"
    170 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column-reverse nowrap"
    171 PASS flexbox.style.webkitFlexFlow is "column-reverse nowrap"
    172 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column-reverse nowrap"
     168PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column-reverse none"
     169PASS flexbox.style.webkitFlexFlow is "column-reverse none"
     170PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column-reverse none"
     171PASS flexbox.style.webkitFlexFlow is "column-reverse none"
     172PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column-reverse none"
    173173PASS flexbox.style.webkitFlexFlow is "column-reverse wrap"
    174174PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column-reverse wrap"
    … …  
    183183PASS flexbox.style.webkitFlexFlow is ""
    184184PASS flexbox.style.webkitFlexFlow is ""
    185 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row nowrap"
     185PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row none"
    186186PASS flexbox.style.webkitFlexFlow is "column"
    187 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column nowrap"
     187PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column none"
    188188PASS flexbox.style.webkitFlexFlow is "column wrap"
    189189PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column wrap"

  • trunk/LayoutTests/css3/flexbox/script-tests/css-properties.js

    r105015 r108102  
    186186
    187187shouldBeEqualToString('flexbox.style.webkitFlexWrap', '');
    188 // The initial value is 'stretch'.
    189 shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexWrap', 'nowrap');
     188// The initial value is 'none'.
     189shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexWrap', 'none');
    190190
    191191flexbox.style.webkitFlexWrap = 'foo';
    192192shouldBeEqualToString('flexbox.style.webkitFlexWrap', '');
    193193
    194 flexbox.style.webkitFlexWrap = 'nowrap';
    195 shouldBeEqualToString('flexbox.style.webkitFlexWrap', 'nowrap');
    196 shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexWrap', 'nowrap');
     194flexbox.style.webkitFlexWrap = 'none';
     195shouldBeEqualToString('flexbox.style.webkitFlexWrap', 'none');
     196shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexWrap', 'none');
    197197
    198198flexbox.style.webkitFlexWrap = 'wrap';
    … …  
    206206flexbox.style.webkitFlexFlow = '';
    207207shouldBeEqualToString('flexbox.style.webkitFlexFlow', '');
    208 shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexFlow', 'row nowrap');
     208shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexFlow', 'row none');
    209209
    210210flexbox.style.webkitFlexFlow = 'foo';
    … …  
    219219
    220220var directions = ['', 'row', 'row-reverse', 'column', 'column-reverse'];
    221 var wraps = ['', 'nowrap', 'wrap', 'wrap-reverse'];
     221var wraps = ['', 'none', 'wrap', 'wrap-reverse'];
    222222directions.forEach(function(direction) {
    223223    wraps.forEach(function(wrap) {
    224         var expectedComputed = (direction || 'row') + ' ' + (wrap || 'nowrap');
     224        var expectedComputed = (direction || 'row') + ' ' + (wrap || 'none');
    225225        var expected = direction + ' ' + wrap;
    226226        testFlexFlowValue(direction + ' ' + wrap, expected, expectedComputed);
    … …  
    238238flexbox.style.webkitFlexFlow = '';
    239239shouldBeEqualToString('flexbox.style.webkitFlexFlow', '');
    240 shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexFlow', 'row nowrap');
     240shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexFlow', 'row none');
    241241flexbox.style.webkitFlexDirection = 'column';
    242242shouldBeEqualToString('flexbox.style.webkitFlexFlow', 'column');
    243 shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexFlow', 'column nowrap');
     243shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexFlow', 'column none');
    244244flexbox.style.webkitFlexWrap = 'wrap';
    245245shouldBeEqualToString('flexbox.style.webkitFlexFlow', 'column wrap');

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

    r107839 r108102  
    148148-webkit-flex-item-align: stretch;
    149149-webkit-flex-direction: row;
    150 -webkit-flex-flow: row nowrap;
    151 -webkit-flex-wrap: nowrap;
     150-webkit-flex-flow: row none;
     151-webkit-flex-wrap: none;
    152152-webkit-font-kerning: auto;
    153153-webkit-font-smoothing: auto;

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

    r107839 r108102  
    147147    -webkit-flex-item-align: stretch
    148148    -webkit-flex-direction: row
    149     -webkit-flex-flow: row nowrap
    150     -webkit-flex-wrap: nowrap
     149    -webkit-flex-flow: row none
     150    -webkit-flex-wrap: none
    151151    -webkit-font-kerning: auto
    152152    -webkit-font-smoothing: auto

  • trunk/LayoutTests/platform/chromium-mac-snowleopard/fast/css/getComputedStyle/computed-style-expected.txt

    r107928 r108102  
    148148-webkit-flex-item-align: stretch;
    149149-webkit-flex-direction: row;
    150 -webkit-flex-flow: row nowrap;
    151 -webkit-flex-wrap: nowrap;
     150-webkit-flex-flow: row none;
     151-webkit-flex-wrap: none;
    152152-webkit-font-kerning: auto;
    153153-webkit-font-smoothing: auto;

  • trunk/LayoutTests/platform/chromium-mac-snowleopard/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt

    r107928 r108102  
    147147    -webkit-flex-item-align: stretch
    148148    -webkit-flex-direction: row
    149     -webkit-flex-flow: row nowrap
    150     -webkit-flex-wrap: nowrap
     149    -webkit-flex-flow: row none
     150    -webkit-flex-wrap: none
    151151    -webkit-font-kerning: auto
    152152    -webkit-font-smoothing: auto

  • trunk/LayoutTests/platform/chromium-mac-snowleopard/svg/css/getComputedStyle-basic-expected.txt

    r107928 r108102  
    293293rect: style.getPropertyValue(-webkit-flex-direction) : row
    294294rect: style.getPropertyCSSValue(-webkit-flex-direction) : [object CSSPrimitiveValue]
    295 rect: style.getPropertyValue(-webkit-flex-flow) : row nowrap
     295rect: style.getPropertyValue(-webkit-flex-flow) : row none
    296296rect: style.getPropertyCSSValue(-webkit-flex-flow) : [object CSSValueList]
    297 rect: style.getPropertyValue(-webkit-flex-wrap) : nowrap
     297rect: style.getPropertyValue(-webkit-flex-wrap) : none
    298298rect: style.getPropertyCSSValue(-webkit-flex-wrap) : [object CSSPrimitiveValue]
    299299rect: style.getPropertyValue(-webkit-font-kerning) : auto
    … …  
    809809g: style.getPropertyValue(-webkit-flex-direction) : row
    810810g: style.getPropertyCSSValue(-webkit-flex-direction) : [object CSSPrimitiveValue]
    811 g: style.getPropertyValue(-webkit-flex-flow) : row nowrap
     811g: style.getPropertyValue(-webkit-flex-flow) : row none
    812812g: style.getPropertyCSSValue(-webkit-flex-flow) : [object CSSValueList]
    813 g: style.getPropertyValue(-webkit-flex-wrap) : nowrap
     813g: style.getPropertyValue(-webkit-flex-wrap) : none
    814814g: style.getPropertyCSSValue(-webkit-flex-wrap) : [object CSSPrimitiveValue]
    815815g: style.getPropertyValue(-webkit-font-kerning) : auto

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

    r107881 r108102  
    148148-webkit-flex-item-align: stretch;
    149149-webkit-flex-direction: row;
    150 -webkit-flex-flow: row nowrap;
    151 -webkit-flex-wrap: nowrap;
     150-webkit-flex-flow: row none;
     151-webkit-flex-wrap: none;
    152152-webkit-font-kerning: auto;
    153153-webkit-font-smoothing: auto;

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

    r107881 r108102  
    147147    -webkit-flex-item-align: stretch
    148148    -webkit-flex-direction: row
    149     -webkit-flex-flow: row nowrap
    150     -webkit-flex-wrap: nowrap
     149    -webkit-flex-flow: row none
     150    -webkit-flex-wrap: none
    151151    -webkit-font-kerning: auto
    152152    -webkit-font-smoothing: auto

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

    r107881 r108102  
    293293rect: style.getPropertyValue(-webkit-flex-direction) : row
    294294rect: style.getPropertyCSSValue(-webkit-flex-direction) : [object CSSPrimitiveValue]
    295 rect: style.getPropertyValue(-webkit-flex-flow) : row nowrap
     295rect: style.getPropertyValue(-webkit-flex-flow) : row none
    296296rect: style.getPropertyCSSValue(-webkit-flex-flow) : [object CSSValueList]
    297 rect: style.getPropertyValue(-webkit-flex-wrap) : nowrap
     297rect: style.getPropertyValue(-webkit-flex-wrap) : none
    298298rect: style.getPropertyCSSValue(-webkit-flex-wrap) : [object CSSPrimitiveValue]
    299299rect: style.getPropertyValue(-webkit-font-kerning) : auto
    … …  
    809809g: style.getPropertyValue(-webkit-flex-direction) : row
    810810g: style.getPropertyCSSValue(-webkit-flex-direction) : [object CSSPrimitiveValue]
    811 g: style.getPropertyValue(-webkit-flex-flow) : row nowrap
     811g: style.getPropertyValue(-webkit-flex-flow) : row none
    812812g: style.getPropertyCSSValue(-webkit-flex-flow) : [object CSSValueList]
    813 g: style.getPropertyValue(-webkit-flex-wrap) : nowrap
     813g: style.getPropertyValue(-webkit-flex-wrap) : none
    814814g: style.getPropertyCSSValue(-webkit-flex-wrap) : [object CSSPrimitiveValue]
    815815g: style.getPropertyValue(-webkit-font-kerning) : auto

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

    r107839 r108102  
    147147    -webkit-flex-item-align: stretch
    148148    -webkit-flex-direction: row
    149     -webkit-flex-flow: row nowrap
    150     -webkit-flex-wrap: nowrap
     149    -webkit-flex-flow: row none
     150    -webkit-flex-wrap: none
    151151    -webkit-font-kerning: auto
    152152    -webkit-font-smoothing: auto

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

    r107839 r108102  
    293293rect: style.getPropertyValue(-webkit-flex-direction) : row
    294294rect: style.getPropertyCSSValue(-webkit-flex-direction) : [object CSSPrimitiveValue]
    295 rect: style.getPropertyValue(-webkit-flex-flow) : row nowrap
     295rect: style.getPropertyValue(-webkit-flex-flow) : row none
    296296rect: style.getPropertyCSSValue(-webkit-flex-flow) : [object CSSValueList]
    297 rect: style.getPropertyValue(-webkit-flex-wrap) : nowrap
     297rect: style.getPropertyValue(-webkit-flex-wrap) : none
    298298rect: style.getPropertyCSSValue(-webkit-flex-wrap) : [object CSSPrimitiveValue]
    299299rect: style.getPropertyValue(-webkit-font-kerning) : auto
    … …  
    807807g: style.getPropertyValue(-webkit-flex-direction) : row
    808808g: style.getPropertyCSSValue(-webkit-flex-direction) : [object CSSPrimitiveValue]
    809 g: style.getPropertyValue(-webkit-flex-flow) : row nowrap
     809g: style.getPropertyValue(-webkit-flex-flow) : row none
    810810g: style.getPropertyCSSValue(-webkit-flex-flow) : [object CSSValueList]
    811 g: style.getPropertyValue(-webkit-flex-wrap) : nowrap
     811g: style.getPropertyValue(-webkit-flex-wrap) : none
    812812g: style.getPropertyCSSValue(-webkit-flex-wrap) : [object CSSPrimitiveValue]
    813813g: style.getPropertyValue(-webkit-font-kerning) : auto

  • trunk/Source/WebCore/ChangeLog

    r108101 r108102  
     12012-02-17  Joe Thomas  <joethomas@motorola.com>
     2
     3        flex-wrap:nowrap should be flex-wrap:none
     4        https://bugs.webkit.org/show_bug.cgi?id=78772
     5
     6        As per the spec http://dev.w3.org/csswg/css3-flexbox/#flex-wrap0, flex-wrap:nowrap should be changed to flex-wrap:none.
     7
     8        Reviewed by Ojan Vafai.
     9
     10        * css/CSSParser.cpp:
     11        (WebCore::CSSParser::parseValue):
     12        * css/CSSPrimitiveValueMappings.h:
     13        (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
     14        (WebCore::CSSPrimitiveValue::operator EFlexWrap):
     15        * css/CSSValueKeywords.in:
     16        * rendering/style/RenderStyle.h:
     17        * rendering/style/RenderStyleConstants.h:
     18
    1192012-02-17  Enrica Casucci  <enrica@apple.com>
    220

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

    r108043 r108102  
    17201720        break;
    17211721    case CSSPropertyWebkitFlexWrap:
    1722         validPrimitive = id == CSSValueNowrap || id == CSSValueWrap || id == CSSValueWrapReverse;
     1722        validPrimitive = id == CSSValueNone || id == CSSValueWrap || id == CSSValueWrapReverse;
    17231723        break;
    17241724    case CSSPropertyWebkitMarquee: {

  • trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h

    r107289 r108102  
    12891289    m_primitiveUnitType = CSS_IDENT;
    12901290    switch (e) {
    1291     case FlexNoWrap:
    1292         m_value.ident = CSSValueNowrap;
     1291    case FlexWrapNone:
     1292        m_value.ident = CSSValueNone;
    12931293        break;
    12941294    case FlexWrap:
    … …  
    13041304{
    13051305    switch (m_value.ident) {
    1306     case CSSValueNowrap:
    1307         return FlexNoWrap;
     1306    case CSSValueNone:
     1307        return FlexWrapNone;
    13081308    case CSSValueWrap:
    13091309        return FlexWrap;
    … …  
    13121312    default:
    13131313        ASSERT_NOT_REACHED();
    1314         return FlexNoWrap;
     1314        return FlexWrapNone;
    13151315    }
    13161316}

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

    r107881 r108102  
    502502column
    503503column-reverse
    504 // nowrap
     504// none
    505505// wrap
    506506wrap-reverse

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

    r107881 r108102  
    15661566    static EFlexAlign initialFlexItemAlign() { return AlignAuto; }
    15671567    static EFlexDirection initialFlexDirection() { return FlowRow; }
    1568     static EFlexWrap initialFlexWrap() { return FlexNoWrap; }
     1568    static EFlexWrap initialFlexWrap() { return FlexWrapNone; }
    15691569    static int initialMarqueeLoopCount() { return -1; }
    15701570    static int initialMarqueeSpeed() { return 85; }

  • trunk/Source/WebCore/rendering/style/RenderStyleConstants.h

    r107289 r108102  
    172172enum EFlexAlign { AlignAuto, AlignStart, AlignEnd, AlignCenter, AlignStretch, AlignBaseline };
    173173enum EFlexDirection { FlowRow, FlowRowReverse, FlowColumn, FlowColumnReverse };
    174 enum EFlexWrap { FlexNoWrap, FlexWrap, FlexWrapReverse };
     174enum EFlexWrap { FlexWrapNone, FlexWrap, FlexWrapReverse };
    175175
    176176enum ETextSecurity {
Note: See TracChangeset for help on using the changeset viewer.