From 04ce38631d7b6a919623ae3891ecf45bd9451cdc Mon Sep 17 00:00:00 2001 From: "tony@chromium.org" Date: Sat, 17 Sep 2011 02:40:27 +0000 Subject: [PATCH] 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: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@95355 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- LayoutTests/ChangeLog | 10 +++++++++ .../css3/flexbox/css-properties-expected.txt | 12 +++++----- .../css3/flexbox/script-tests/css-properties.js | 18 +++++++-------- Source/WebCore/ChangeLog | 15 +++++++++++++ Source/WebCore/css/CSSParser.cpp | 2 +- Source/WebCore/css/CSSPrimitiveValueMappings.h | 26 +++++++++++----------- Source/WebCore/css/CSSValueKeywords.in | 8 +++---- .../WebCore/rendering/style/RenderStyleConstants.h | 2 +- 8 files changed, 59 insertions(+), 34 deletions(-) diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog index 93cd558..1f0648c 100644 --- a/LayoutTests/ChangeLog +++ b/LayoutTests/ChangeLog @@ -1,3 +1,13 @@ +2011-09-16 Tony Chang + + Rename flex-align values to match the spec + https://bugs.webkit.org/show_bug.cgi?id=67741 + + Reviewed by Ojan Vafai. + + * css3/flexbox/css-properties-expected.txt: + * css3/flexbox/script-tests/css-properties.js: + 2011-09-16 Ryosuke Niwa Chromium pixel test rebaseline for r95335. diff --git a/LayoutTests/css3/flexbox/css-properties-expected.txt b/LayoutTests/css3/flexbox/css-properties-expected.txt index 4bec558..e693a82 100644 --- a/LayoutTests/css3/flexbox/css-properties-expected.txt +++ b/LayoutTests/css3/flexbox/css-properties-expected.txt @@ -31,12 +31,12 @@ PASS window.getComputedStyle(flexbox, null).webkitFlexPack is "start" PASS flexbox.style.webkitFlexAlign is "" PASS window.getComputedStyle(flexbox, null).webkitFlexAlign is "stretch" PASS flexbox.style.webkitFlexAlign is "" -PASS flexbox.style.webkitFlexAlign is "before" -PASS window.getComputedStyle(flexbox, null).webkitFlexAlign is "before" -PASS flexbox.style.webkitFlexAlign is "after" -PASS window.getComputedStyle(flexbox, null).webkitFlexAlign is "after" -PASS flexbox.style.webkitFlexAlign is "middle" -PASS window.getComputedStyle(flexbox, null).webkitFlexAlign is "middle" +PASS flexbox.style.webkitFlexAlign is "start" +PASS window.getComputedStyle(flexbox, null).webkitFlexAlign is "start" +PASS flexbox.style.webkitFlexAlign is "end" +PASS window.getComputedStyle(flexbox, null).webkitFlexAlign is "end" +PASS flexbox.style.webkitFlexAlign is "center" +PASS window.getComputedStyle(flexbox, null).webkitFlexAlign is "center" PASS flexbox.style.webkitFlexAlign is "stretch" PASS window.getComputedStyle(flexbox, null).webkitFlexAlign is "stretch" PASS flexbox.style.webkitFlexAlign is "baseline" diff --git a/LayoutTests/css3/flexbox/script-tests/css-properties.js b/LayoutTests/css3/flexbox/script-tests/css-properties.js index 3fafddc..36b42bc 100644 --- a/LayoutTests/css3/flexbox/script-tests/css-properties.js +++ b/LayoutTests/css3/flexbox/script-tests/css-properties.js @@ -76,17 +76,17 @@ shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexAlign', flexbox.style.webkitFlexAlign = 'foo'; shouldBeEqualToString('flexbox.style.webkitFlexAlign', ''); -flexbox.style.webkitFlexAlign = 'before'; -shouldBeEqualToString('flexbox.style.webkitFlexAlign', 'before'); -shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexAlign', 'before'); +flexbox.style.webkitFlexAlign = 'start'; +shouldBeEqualToString('flexbox.style.webkitFlexAlign', 'start'); +shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexAlign', 'start'); -flexbox.style.webkitFlexAlign = 'after'; -shouldBeEqualToString('flexbox.style.webkitFlexAlign', 'after'); -shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexAlign', 'after'); +flexbox.style.webkitFlexAlign = 'end'; +shouldBeEqualToString('flexbox.style.webkitFlexAlign', 'end'); +shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexAlign', 'end'); -flexbox.style.webkitFlexAlign = 'middle'; -shouldBeEqualToString('flexbox.style.webkitFlexAlign', 'middle'); -shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexAlign', 'middle'); +flexbox.style.webkitFlexAlign = 'center'; +shouldBeEqualToString('flexbox.style.webkitFlexAlign', 'center'); +shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexAlign', 'center'); flexbox.style.webkitFlexAlign = 'stretch'; shouldBeEqualToString('flexbox.style.webkitFlexAlign', 'stretch'); diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 44e855a..1056afc 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,18 @@ +2011-09-16 Tony Chang + + Rename flex-align values to match the spec + https://bugs.webkit.org/show_bug.cgi?id=67741 + + Reviewed by Ojan Vafai. + + * css/CSSParser.cpp: + (WebCore::CSSParser::parseValue): + * css/CSSPrimitiveValueMappings.h: + (WebCore::CSSPrimitiveValue::CSSPrimitiveValue): + (WebCore::CSSPrimitiveValue::operator EFlexAlign): + * css/CSSValueKeywords.in: + * rendering/style/RenderStyleConstants.h: + 2011-09-16 Kentaro Hara Implement an ErrorEvent constructor for JSC diff --git a/Source/WebCore/css/CSSParser.cpp b/Source/WebCore/css/CSSParser.cpp index af7c7cc..515482d 100644 --- a/Source/WebCore/css/CSSParser.cpp +++ b/Source/WebCore/css/CSSParser.cpp @@ -1580,7 +1580,7 @@ bool CSSParser::parseValue(int propId, bool important) validPrimitive = id == CSSValueStart || id == CSSValueEnd || id == CSSValueCenter || id == CSSValueJustify; break; case CSSPropertyWebkitFlexAlign: - validPrimitive = id == CSSValueBefore || id == CSSValueAfter || id == CSSValueMiddle || id == CSSValueBaseline || id == CSSValueStretch; + validPrimitive = id == CSSValueStart || id == CSSValueEnd || id == CSSValueCenter || id == CSSValueBaseline || id == CSSValueStretch; break; case CSSPropertyWebkitFlexFlow: // FIXME: -webkit-flex-flow takes a second "wrap" value. diff --git a/Source/WebCore/css/CSSPrimitiveValueMappings.h b/Source/WebCore/css/CSSPrimitiveValueMappings.h index 208b618..ebb9b9d 100644 --- a/Source/WebCore/css/CSSPrimitiveValueMappings.h +++ b/Source/WebCore/css/CSSPrimitiveValueMappings.h @@ -1068,14 +1068,14 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EFlexAlign e) , m_hasCachedCSSText(false) { switch (e) { - case AlignBefore: - m_value.ident = CSSValueBefore; + case AlignStart: + m_value.ident = CSSValueStart; break; - case AlignAfter: - m_value.ident = CSSValueAfter; + case AlignEnd: + m_value.ident = CSSValueEnd; break; - case AlignMiddle: - m_value.ident = CSSValueMiddle; + case AlignCenter: + m_value.ident = CSSValueCenter; break; case AlignStretch: m_value.ident = CSSValueStretch; @@ -1089,19 +1089,19 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EFlexAlign e) template<> inline CSSPrimitiveValue::operator EFlexAlign() const { switch (m_value.ident) { - case CSSValueBefore: - return AlignBefore; - case CSSValueAfter: - return AlignAfter; - case CSSValueMiddle: - return AlignMiddle; + case CSSValueStart: + return AlignStart; + case CSSValueEnd: + return AlignEnd; + case CSSValueCenter: + return AlignCenter; case CSSValueStretch: return AlignStretch; case CSSValueBaseline: return AlignBaseline; default: ASSERT_NOT_REACHED(); - return AlignBefore; + return AlignStart; } } diff --git a/Source/WebCore/css/CSSValueKeywords.in b/Source/WebCore/css/CSSValueKeywords.in index ba18fb5..ac14370 100644 --- a/Source/WebCore/css/CSSValueKeywords.in +++ b/Source/WebCore/css/CSSValueKeywords.in @@ -472,11 +472,11 @@ single multiple // CSS_PROP_FLEX_ALIGN -before -after -// middle -// stretch +// start +// end +// center // baseline +// stretch // CSS_PROP_FLEX_FLOW // FIXME: Add the wrap values. diff --git a/Source/WebCore/rendering/style/RenderStyleConstants.h b/Source/WebCore/rendering/style/RenderStyleConstants.h index fe4d9a6..8bb0e62 100644 --- a/Source/WebCore/rendering/style/RenderStyleConstants.h +++ b/Source/WebCore/rendering/style/RenderStyleConstants.h @@ -169,7 +169,7 @@ enum EBoxDirection { BNORMAL, BREVERSE }; // CSS3 Flexbox Properties enum EFlexPack { PackStart, PackEnd, PackCenter, PackJustify }; -enum EFlexAlign { AlignBefore, AlignAfter, AlignMiddle, AlignStretch, AlignBaseline }; +enum EFlexAlign { AlignStart, AlignEnd, AlignCenter, AlignStretch, AlignBaseline }; enum EFlexFlow { FlowRow, FlowRowReverse, FlowColumn, FlowColumnReverse, FlowHorizontal, FlowHorizontalReverse, FlowHorizontalLeftToRight, FlowHorizontalRightToLeft, FlowVertical, FlowVerticalReverse, FlowVerticalTopToBottom, FlowVerticalBottomToTop}; -- 2.7.4