Changeset 95355 in webkit


Ignore:
Timestamp:
Sep 16, 2011 7:40:27 PM (13 years ago)
Author:
tony@chromium.org
Message:

Rename flex-align values to match the spec
​https://bugs.webkit.org/show_bug.cgi?id=67741

Reviewed by Ojan Vafai.

Source/WebCore:

  • css/CSSParser.cpp:

(WebCore::CSSParser::parseValue):

  • css/CSSPrimitiveValueMappings.h:

(WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
(WebCore::CSSPrimitiveValue::operator EFlexAlign):

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

LayoutTests:

  • css3/flexbox/css-properties-expected.txt:
  • css3/flexbox/script-tests/css-properties.js:
Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r95353 r95355  
     12011-09-16  Tony Chang  <tony@chromium.org>
     2
     3        Rename flex-align values to match the spec
     4        https://bugs.webkit.org/show_bug.cgi?id=67741
     5
     6        Reviewed by Ojan Vafai.
     7
     8        * css3/flexbox/css-properties-expected.txt:
     9        * css3/flexbox/script-tests/css-properties.js:
     10
    1112011-09-16  Ryosuke Niwa  <rniwa@webkit.org>
    212

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

    r94104 r95355  
    3232PASS window.getComputedStyle(flexbox, null).webkitFlexAlign is "stretch"
    3333PASS flexbox.style.webkitFlexAlign is ""
    34 PASS flexbox.style.webkitFlexAlign is "before"
    35 PASS window.getComputedStyle(flexbox, null).webkitFlexAlign is "before"
    36 PASS flexbox.style.webkitFlexAlign is "after"
    37 PASS window.getComputedStyle(flexbox, null).webkitFlexAlign is "after"
    38 PASS flexbox.style.webkitFlexAlign is "middle"
    39 PASS window.getComputedStyle(flexbox, null).webkitFlexAlign is "middle"
     34PASS flexbox.style.webkitFlexAlign is "start"
     35PASS window.getComputedStyle(flexbox, null).webkitFlexAlign is "start"
     36PASS flexbox.style.webkitFlexAlign is "end"
     37PASS window.getComputedStyle(flexbox, null).webkitFlexAlign is "end"
     38PASS flexbox.style.webkitFlexAlign is "center"
     39PASS window.getComputedStyle(flexbox, null).webkitFlexAlign is "center"
    4040PASS flexbox.style.webkitFlexAlign is "stretch"
    4141PASS window.getComputedStyle(flexbox, null).webkitFlexAlign is "stretch"

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

    r94104 r95355  
    7777shouldBeEqualToString('flexbox.style.webkitFlexAlign', '');
    7878
    79 flexbox.style.webkitFlexAlign = 'before';
    80 shouldBeEqualToString('flexbox.style.webkitFlexAlign', 'before');
    81 shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexAlign', 'before');
     79flexbox.style.webkitFlexAlign = 'start';
     80shouldBeEqualToString('flexbox.style.webkitFlexAlign', 'start');
     81shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexAlign', 'start');
    8282
    83 flexbox.style.webkitFlexAlign = 'after';
    84 shouldBeEqualToString('flexbox.style.webkitFlexAlign', 'after');
    85 shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexAlign', 'after');
     83flexbox.style.webkitFlexAlign = 'end';
     84shouldBeEqualToString('flexbox.style.webkitFlexAlign', 'end');
     85shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexAlign', 'end');
    8686
    87 flexbox.style.webkitFlexAlign = 'middle';
    88 shouldBeEqualToString('flexbox.style.webkitFlexAlign', 'middle');
    89 shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexAlign', 'middle');
     87flexbox.style.webkitFlexAlign = 'center';
     88shouldBeEqualToString('flexbox.style.webkitFlexAlign', 'center');
     89shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexAlign', 'center');
    9090
    9191flexbox.style.webkitFlexAlign = 'stretch';

  • trunk/Source/WebCore/ChangeLog

    r95352 r95355  
     12011-09-16  Tony Chang  <tony@chromium.org>
     2
     3        Rename flex-align values to match the spec
     4        https://bugs.webkit.org/show_bug.cgi?id=67741
     5
     6        Reviewed by Ojan Vafai.
     7
     8        * css/CSSParser.cpp:
     9        (WebCore::CSSParser::parseValue):
     10        * css/CSSPrimitiveValueMappings.h:
     11        (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
     12        (WebCore::CSSPrimitiveValue::operator EFlexAlign):
     13        * css/CSSValueKeywords.in:
     14        * rendering/style/RenderStyleConstants.h:
     15
    1162011-09-16  Kentaro Hara  <haraken@chromium.org>
    217

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

    r95242 r95355  
    15811581        break;
    15821582    case CSSPropertyWebkitFlexAlign:
    1583         validPrimitive = id == CSSValueBefore || id == CSSValueAfter || id == CSSValueMiddle || id == CSSValueBaseline || id == CSSValueStretch;
     1583        validPrimitive = id == CSSValueStart || id == CSSValueEnd || id == CSSValueCenter || id == CSSValueBaseline || id == CSSValueStretch;
    15841584        break;
    15851585    case CSSPropertyWebkitFlexFlow:

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

    r94104 r95355  
    10691069{
    10701070    switch (e) {
    1071     case AlignBefore:
    1072         m_value.ident = CSSValueBefore;
    1073         break;
    1074     case AlignAfter:
    1075         m_value.ident = CSSValueAfter;
    1076         break;
    1077     case AlignMiddle:
    1078         m_value.ident = CSSValueMiddle;
     1071    case AlignStart:
     1072        m_value.ident = CSSValueStart;
     1073        break;
     1074    case AlignEnd:
     1075        m_value.ident = CSSValueEnd;
     1076        break;
     1077    case AlignCenter:
     1078        m_value.ident = CSSValueCenter;
    10791079        break;
    10801080    case AlignStretch:
    … …  
    10901090{
    10911091    switch (m_value.ident) {
    1092     case CSSValueBefore:
    1093         return AlignBefore;
    1094     case CSSValueAfter:
    1095         return AlignAfter;
    1096     case CSSValueMiddle:
    1097         return AlignMiddle;
     1092    case CSSValueStart:
     1093        return AlignStart;
     1094    case CSSValueEnd:
     1095        return AlignEnd;
     1096    case CSSValueCenter:
     1097        return AlignCenter;
    10981098    case CSSValueStretch:
    10991099        return AlignStretch;
    … …  
    11021102    default:
    11031103        ASSERT_NOT_REACHED();
    1104         return AlignBefore;
     1104        return AlignStart;
    11051105    }
    11061106}

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

    r94710 r95355  
    473473
    474474// CSS_PROP_FLEX_ALIGN
    475 before
    476 after
    477 // middle
     475// start
     476// end
     477// center
     478// baseline
    478479// stretch
    479 // baseline
    480480
    481481// CSS_PROP_FLEX_FLOW

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

    r94104 r95355  
    170170
    171171enum EFlexPack { PackStart, PackEnd, PackCenter, PackJustify };
    172 enum EFlexAlign { AlignBefore, AlignAfter, AlignMiddle, AlignStretch, AlignBaseline };
     172enum EFlexAlign { AlignStart, AlignEnd, AlignCenter, AlignStretch, AlignBaseline };
    173173enum EFlexFlow { FlowRow, FlowRowReverse, FlowColumn, FlowColumnReverse,
    174174    FlowHorizontal, FlowHorizontalReverse, FlowHorizontalLeftToRight, FlowHorizontalRightToLeft,
Note: See TracChangeset for help on using the changeset viewer.