Changeset 132136 in webkit


Ignore:
Timestamp:
Oct 22, 2012 2:32:01 PM (11 years ago)
Author:
tony@chromium.org
Message:

WebKit does not support 'flex-wrap: nowrap'
​https://bugs.webkit.org/show_bug.cgi?id=99924

Reviewed by Ojan Vafai.

Source/WebCore:

The spec changed back from using none to nowrap for the single-line
flexbox case.
​http://dev.w3.org/csswg/css3-flexbox/#flex-wrap-property

No new tests, covered by css3/flexbox/css-properties.html and others.

  • css/CSSParser.cpp:

(WebCore::isValidKeywordPropertyAndValue):

  • css/CSSPrimitiveValueMappings.h:

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

  • css/CSSValueKeywords.in:
  • rendering/RenderBox.cpp:

(WebCore::isStretchingColumnFlexItem):
(WebCore::RenderBox::sizesLogicalWidthToFitContent):

  • rendering/RenderFlexibleBox.cpp:

(WebCore::RenderFlexibleBox::isMultiline):

  • rendering/style/RenderStyle.h:
  • rendering/style/RenderStyleConstants.h:

LayoutTests:

Update expectations (find and replace none with nowrap).

  • css3/flexbox/css-properties-expected.txt:
  • css3/flexbox/css-properties.html:
  • fast/css/getComputedStyle/computed-style-expected.txt:
  • fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
  • svg/css/getComputedStyle-basic-expected.txt:
Location:
trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r132135 r132136  
     12012-10-22  Tony Chang  <tony@chromium.org>
     2
     3        WebKit does not support 'flex-wrap: nowrap'
     4        https://bugs.webkit.org/show_bug.cgi?id=99924
     5
     6        Reviewed by Ojan Vafai.
     7
     8        Update expectations (find and replace none with nowrap).
     9
     10        * css3/flexbox/css-properties-expected.txt:
     11        * css3/flexbox/css-properties.html:
     12        * fast/css/getComputedStyle/computed-style-expected.txt:
     13        * fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
     14        * svg/css/getComputedStyle-basic-expected.txt:
     15
    1162012-10-22  Emil A Eklund  <eae@chromium.org>
    217
    … …  
    17161731        * platform/gtk/accessibility/media-controls-panel-title.html: Updated.
    17171732
    1718 2012-10-19  Emil A Eklund  <eae@chromium.org>
     17332012-10-22  Emil A Eklund  <eae@chromium.org>
    17191734
    17201735        Convert fast/sub-pixel/file-upload-control-at-fractional-offset-expected.html to ref test
    … …  
    17371752        * platform/gtk/fast/sub-pixel/file-upload-control-at-fractional-offset-expected.txt: Removed.
    17381753
    1739 <<<<<<< .mine
    1740 2012-10-22  Emil A Eklund  <eae@chromium.org>
    1741 
    1742         Convert fast/sub-pixel/file-upload-control-at-fractional-offset-expected.html to ref test
    1743         https://bugs.webkit.org/show_bug.cgi?id=99869
    1744 
    1745         Reviewed by Eric Seidel.
    1746 
    1747         * fast/sub-pixel/file-upload-control-at-fractional-offset-expected.html: Added.
    1748         * platform/chromium-linux/fast/sub-pixel/file-upload-control-at-fractional-offset-expected.png: Removed.
    1749         * platform/chromium-linux/fast/sub-pixel/file-upload-control-at-fractional-offset-expected.txt: Removed.
    1750         * platform/chromium-mac-snowleopard/fast/sub-pixel/file-upload-control-at-fractional-offset-expected.png: Removed.
    1751         * platform/chromium-mac/fast/sub-pixel/file-upload-control-at-fractional-offset-expected.png: Removed.
    1752         * platform/chromium-mac/fast/sub-pixel/file-upload-control-at-fractional-offset-expected.txt: Removed.
    1753         * platform/chromium-win/fast/sub-pixel/file-upload-control-at-fractional-offset-expected.png: Removed.
    1754         * platform/chromium-win/fast/sub-pixel/file-upload-control-at-fractional-offset-expected.txt: Removed.
    1755         * platform/gtk/fast/sub-pixel/file-upload-control-at-fractional-offset-expected.png: Removed.
    1756         * platform/gtk/fast/sub-pixel/file-upload-control-at-fractional-offset-expected.txt: Removed.
    1757 
    1758 =======
    175917542012-10-16  Andrey Kosyakov  <caseq@chromium.org>
    17601755
    … …  
    17681763        * inspector/timeline/timeline-enum-stability-expected.txt:
    17691764
    1770 >>>>>>> .r132088
    177117652012-10-22  Vsevolod Vlasov  <vsevik@chromium.org>
    17721766

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

    r124276 r132136  
    8989PASS window.getComputedStyle(flexbox, null).webkitFlexDirection is "column-reverse"
    9090PASS flexbox.style.webkitFlexWrap is ""
    91 PASS window.getComputedStyle(flexbox, null).webkitFlexWrap is "none"
     91PASS window.getComputedStyle(flexbox, null).webkitFlexWrap is "nowrap"
    9292PASS flexbox.style.webkitFlexWrap is ""
    93 PASS flexbox.style.webkitFlexWrap is "none"
    94 PASS window.getComputedStyle(flexbox, null).webkitFlexWrap is "none"
     93PASS flexbox.style.webkitFlexWrap is "nowrap"
     94PASS window.getComputedStyle(flexbox, null).webkitFlexWrap is "nowrap"
    9595PASS flexbox.style.webkitFlexWrap is "wrap"
    9696PASS window.getComputedStyle(flexbox, null).webkitFlexWrap is "wrap"
    … …  
    9898PASS window.getComputedStyle(flexbox, null).webkitFlexWrap is "wrap-reverse"
    9999PASS flexbox.style.webkitFlexFlow is ""
    100 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row none"
    101 PASS flexbox.style.webkitFlexFlow is ""
    102 PASS flexbox.style.webkitFlexFlow is ""
    103 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row none"
    104 PASS flexbox.style.webkitFlexFlow is ""
    105 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row none"
    106 PASS flexbox.style.webkitFlexFlow is "none"
    107 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row none"
    108 PASS flexbox.style.webkitFlexFlow is "none"
    109 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row none"
     100PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row nowrap"
     101PASS flexbox.style.webkitFlexFlow is ""
     102PASS flexbox.style.webkitFlexFlow is ""
     103PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row nowrap"
     104PASS flexbox.style.webkitFlexFlow is ""
     105PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row nowrap"
     106PASS flexbox.style.webkitFlexFlow is "nowrap"
     107PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row nowrap"
     108PASS flexbox.style.webkitFlexFlow is "nowrap"
     109PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row nowrap"
    110110PASS flexbox.style.webkitFlexFlow is "wrap"
    111111PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row wrap"
    … …  
    117117PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row wrap-reverse"
    118118PASS flexbox.style.webkitFlexFlow is "row"
    119 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row none"
     119PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row nowrap"
    120120PASS flexbox.style.webkitFlexFlow is "row"
    121 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row none"
    122 PASS flexbox.style.webkitFlexFlow is "row none"
    123 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row none"
    124 PASS flexbox.style.webkitFlexFlow is "row none"
    125 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row none"
     121PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row nowrap"
     122PASS flexbox.style.webkitFlexFlow is "row nowrap"
     123PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row nowrap"
     124PASS flexbox.style.webkitFlexFlow is "row nowrap"
     125PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row nowrap"
    126126PASS flexbox.style.webkitFlexFlow is "row wrap"
    127127PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row wrap"
    … …  
    133133PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row wrap-reverse"
    134134PASS flexbox.style.webkitFlexFlow is "row-reverse"
    135 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row-reverse none"
     135PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row-reverse nowrap"
    136136PASS flexbox.style.webkitFlexFlow is "row-reverse"
    137 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row-reverse none"
    138 PASS flexbox.style.webkitFlexFlow is "row-reverse none"
    139 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row-reverse none"
    140 PASS flexbox.style.webkitFlexFlow is "row-reverse none"
    141 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row-reverse none"
     137PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row-reverse nowrap"
     138PASS flexbox.style.webkitFlexFlow is "row-reverse nowrap"
     139PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row-reverse nowrap"
     140PASS flexbox.style.webkitFlexFlow is "row-reverse nowrap"
     141PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row-reverse nowrap"
    142142PASS flexbox.style.webkitFlexFlow is "row-reverse wrap"
    143143PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row-reverse wrap"
    … …  
    149149PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row-reverse wrap-reverse"
    150150PASS flexbox.style.webkitFlexFlow is "column"
    151 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column none"
     151PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column nowrap"
    152152PASS flexbox.style.webkitFlexFlow is "column"
    153 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column none"
    154 PASS flexbox.style.webkitFlexFlow is "column none"
    155 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column none"
    156 PASS flexbox.style.webkitFlexFlow is "column none"
    157 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column none"
     153PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column nowrap"
     154PASS flexbox.style.webkitFlexFlow is "column nowrap"
     155PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column nowrap"
     156PASS flexbox.style.webkitFlexFlow is "column nowrap"
     157PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column nowrap"
    158158PASS flexbox.style.webkitFlexFlow is "column wrap"
    159159PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column wrap"
    … …  
    165165PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column wrap-reverse"
    166166PASS flexbox.style.webkitFlexFlow is "column-reverse"
    167 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column-reverse none"
     167PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column-reverse nowrap"
    168168PASS flexbox.style.webkitFlexFlow is "column-reverse"
    169 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column-reverse none"
    170 PASS flexbox.style.webkitFlexFlow is "column-reverse none"
    171 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column-reverse none"
    172 PASS flexbox.style.webkitFlexFlow is "column-reverse none"
    173 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column-reverse none"
     169PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column-reverse nowrap"
     170PASS flexbox.style.webkitFlexFlow is "column-reverse nowrap"
     171PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column-reverse nowrap"
     172PASS flexbox.style.webkitFlexFlow is "column-reverse nowrap"
     173PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column-reverse nowrap"
    174174PASS flexbox.style.webkitFlexFlow is "column-reverse wrap"
    175175PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column-reverse wrap"
    … …  
    184184PASS flexbox.style.webkitFlexFlow is ""
    185185PASS flexbox.style.webkitFlexFlow is ""
    186 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row none"
     186PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row nowrap"
    187187PASS flexbox.style.webkitFlexFlow is "column"
    188 PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column none"
     188PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column nowrap"
    189189PASS flexbox.style.webkitFlexFlow is "column wrap"
    190190PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column wrap"

  • trunk/LayoutTests/css3/flexbox/css-properties.html

    r124276 r132136  
    197197
    198198shouldBeEqualToString('flexbox.style.webkitFlexWrap', '');
    199 // The initial value is 'none'.
    200 shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexWrap', 'none');
     199// The initial value is 'nowrap'.
     200shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexWrap', 'nowrap');
    201201
    202202flexbox.style.webkitFlexWrap = 'foo';
    203203shouldBeEqualToString('flexbox.style.webkitFlexWrap', '');
    204204
    205 flexbox.style.webkitFlexWrap = 'none';
    206 shouldBeEqualToString('flexbox.style.webkitFlexWrap', 'none');
    207 shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexWrap', 'none');
     205flexbox.style.webkitFlexWrap = 'nowrap';
     206shouldBeEqualToString('flexbox.style.webkitFlexWrap', 'nowrap');
     207shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexWrap', 'nowrap');
    208208
    209209flexbox.style.webkitFlexWrap = 'wrap';
    … …  
    217217flexbox.style.webkitFlexFlow = '';
    218218shouldBeEqualToString('flexbox.style.webkitFlexFlow', '');
    219 shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexFlow', 'row none');
     219shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexFlow', 'row nowrap');
    220220
    221221flexbox.style.webkitFlexFlow = 'foo';
    … …  
    230230
    231231var directions = ['', 'row', 'row-reverse', 'column', 'column-reverse'];
    232 var wraps = ['', 'none', 'wrap', 'wrap-reverse'];
     232var wraps = ['', 'nowrap', 'wrap', 'wrap-reverse'];
    233233directions.forEach(function(direction) {
    234234    wraps.forEach(function(wrap) {
    235         var expectedComputed = (direction || 'row') + ' ' + (wrap || 'none');
     235        var expectedComputed = (direction || 'row') + ' ' + (wrap || 'nowrap');
    236236        var expected = direction + ' ' + wrap;
    237237        testFlexFlowValue(direction + ' ' + wrap, expected, expectedComputed);
    … …  
    249249flexbox.style.webkitFlexFlow = '';
    250250shouldBeEqualToString('flexbox.style.webkitFlexFlow', '');
    251 shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexFlow', 'row none');
     251shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexFlow', 'row nowrap');
    252252flexbox.style.webkitFlexDirection = 'column';
    253253flexbox.style.webkitFlexWrap = 'initial';
    254254shouldBeEqualToString('flexbox.style.webkitFlexFlow', 'column');
    255 shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexFlow', 'column none');
     255shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexFlow', 'column nowrap');
    256256flexbox.style.webkitFlexWrap = 'wrap';
    257257shouldBeEqualToString('flexbox.style.webkitFlexFlow', 'column wrap');

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

    r125716 r132136  
    148148-webkit-align-self: stretch;
    149149-webkit-flex-direction: row;
    150 -webkit-flex-wrap: none;
     150-webkit-flex-wrap: nowrap;
    151151-webkit-justify-content: flex-start;
    152152-webkit-font-kerning: auto;

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

    r125716 r132136  
    147147-webkit-align-self: stretch
    148148-webkit-flex-direction: row
    149 -webkit-flex-wrap: none
     149-webkit-flex-wrap: nowrap
    150150-webkit-justify-content: flex-start
    151151-webkit-font-kerning: auto

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

    r125716 r132136  
    293293rect: style.getPropertyValue(-webkit-flex-direction) : row
    294294rect: style.getPropertyCSSValue(-webkit-flex-direction) : [object CSSPrimitiveValue]
    295 rect: style.getPropertyValue(-webkit-flex-wrap) : none
     295rect: style.getPropertyValue(-webkit-flex-wrap) : nowrap
    296296rect: style.getPropertyCSSValue(-webkit-flex-wrap) : [object CSSPrimitiveValue]
    297297rect: style.getPropertyValue(-webkit-justify-content) : flex-start
    … …  
    795795g: style.getPropertyValue(-webkit-flex-direction) : row
    796796g: style.getPropertyCSSValue(-webkit-flex-direction) : [object CSSPrimitiveValue]
    797 g: style.getPropertyValue(-webkit-flex-wrap) : none
     797g: style.getPropertyValue(-webkit-flex-wrap) : nowrap
    798798g: style.getPropertyCSSValue(-webkit-flex-wrap) : [object CSSPrimitiveValue]
    799799g: style.getPropertyValue(-webkit-justify-content) : flex-start

  • trunk/Source/WebCore/ChangeLog

    r132130 r132136  
     12012-10-22  Tony Chang  <tony@chromium.org>
     2
     3        WebKit does not support 'flex-wrap: nowrap'
     4        https://bugs.webkit.org/show_bug.cgi?id=99924
     5
     6        Reviewed by Ojan Vafai.
     7
     8        The spec changed back from using none to nowrap for the single-line
     9        flexbox case.
     10        http://dev.w3.org/csswg/css3-flexbox/#flex-wrap-property
     11
     12        No new tests, covered by css3/flexbox/css-properties.html and others.
     13
     14        * css/CSSParser.cpp:
     15        (WebCore::isValidKeywordPropertyAndValue):
     16        * css/CSSPrimitiveValueMappings.h:
     17        (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
     18        (WebCore::CSSPrimitiveValue::operator EFlexWrap):
     19        * css/CSSValueKeywords.in:
     20        * rendering/RenderBox.cpp:
     21        (WebCore::isStretchingColumnFlexItem):
     22        (WebCore::RenderBox::sizesLogicalWidthToFitContent):
     23        * rendering/RenderFlexibleBox.cpp:
     24        (WebCore::RenderFlexibleBox::isMultiline):
     25        * rendering/style/RenderStyle.h:
     26        * rendering/style/RenderStyleConstants.h:
     27
    1282012-10-22  Mike West  <mkwst@chromium.org>
    229

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

    r131925 r132136  
    807807        break;
    808808    case CSSPropertyWebkitFlexWrap:
    809         if (valueID == CSSValueNone || valueID == CSSValueWrap || valueID == CSSValueWrapReverse)
     809        if (valueID == CSSValueNowrap || valueID == CSSValueWrap || valueID == CSSValueWrapReverse)
    810810             return true;
    811811        break;

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

    r131925 r132136  
    13811381    m_primitiveUnitType = CSS_IDENT;
    13821382    switch (e) {
    1383     case FlexWrapNone:
    1384         m_value.ident = CSSValueNone;
     1383    case FlexNoWrap:
     1384        m_value.ident = CSSValueNowrap;
    13851385        break;
    13861386    case FlexWrap:
    … …  
    13961396{
    13971397    switch (m_value.ident) {
    1398     case CSSValueNone:
    1399         return FlexWrapNone;
     1398    case CSSValueNowrap:
     1399        return FlexNoWrap;
    14001400    case CSSValueWrap:
    14011401        return FlexWrap;
    … …  
    14051405
    14061406    ASSERT_NOT_REACHED();
    1407     return FlexWrapNone;
     1407    return FlexNoWrap;
    14081408}
    14091409

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

    r131925 r132136  
    518518column
    519519column-reverse
    520 // none
     520// nowrap
    521521// wrap
    522522wrap-reverse

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

    r132112 r132136  
    17871787
    17881788    // We don't stretch multiline flexboxes because they need to apply line spacing (align-content) first.
    1789     if (parent->isFlexibleBox() && parent->style()->flexWrap() == FlexWrapNone && parent->style()->isColumnFlexDirection() && flexItemHasStretchAlignment(flexitem))
     1789    if (parent->isFlexibleBox() && parent->style()->flexWrap() == FlexNoWrap && parent->style()->isColumnFlexDirection() && flexItemHasStretchAlignment(flexitem))
    17901790        return true;
    17911791    return false;
    … …  
    18211821    if (parent()->isFlexibleBox()) {
    18221822        // For multiline columns, we need to apply align-content first, so we can't stretch now.
    1823         if (!parent()->style()->isColumnFlexDirection() || parent()->style()->flexWrap() != FlexWrapNone)
     1823        if (!parent()->style()->isColumnFlexDirection() || parent()->style()->flexWrap() != FlexNoWrap)
    18241824            return true;
    18251825        if (!flexItemHasStretchAlignment(this))

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

    r132112 r132136  
    426426bool RenderFlexibleBox::isMultiline() const
    427427{
    428     return style()->flexWrap() != FlexWrapNone;
     428    return style()->flexWrap() != FlexNoWrap;
    429429}
    430430

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

    r132076 r132136  
    16351635    static EAlignItems initialAlignSelf() { return AlignAuto; }
    16361636    static EFlexDirection initialFlexDirection() { return FlowRow; }
    1637     static EFlexWrap initialFlexWrap() { return FlexWrapNone; }
     1637    static EFlexWrap initialFlexWrap() { return FlexNoWrap; }
    16381638    static EJustifyContent initialJustifyContent() { return JustifyFlexStart; }
    16391639    static int initialMarqueeLoopCount() { return -1; }

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

    r132076 r132136  
    172172enum EAlignItems { AlignAuto, AlignFlexStart, AlignFlexEnd, AlignCenter, AlignStretch, AlignBaseline };
    173173enum EFlexDirection { FlowRow, FlowRowReverse, FlowColumn, FlowColumnReverse };
    174 enum EFlexWrap { FlexWrapNone, FlexWrap, FlexWrapReverse };
     174enum EFlexWrap { FlexNoWrap, FlexWrap, FlexWrapReverse };
    175175enum EJustifyContent { JustifyFlexStart, JustifyFlexEnd, JustifyCenter, JustifySpaceBetween, JustifySpaceAround };
    176176
Note: See TracChangeset for help on using the changeset viewer.