Diff
Modified: trunk/LayoutTests/ChangeLog (95354 => 95355)
--- trunk/LayoutTests/ChangeLog 2011-09-17 02:31:00 UTC (rev 95354)
+++ trunk/LayoutTests/ChangeLog 2011-09-17 02:40:27 UTC (rev 95355)
@@ -1,3 +1,13 @@
+2011-09-16 Tony Chang <[email protected]>
+
+ 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 <[email protected]>
Chromium pixel test rebaseline for r95335.
Modified: trunk/LayoutTests/css3/flexbox/css-properties-expected.txt (95354 => 95355)
--- trunk/LayoutTests/css3/flexbox/css-properties-expected.txt 2011-09-17 02:31:00 UTC (rev 95354)
+++ trunk/LayoutTests/css3/flexbox/css-properties-expected.txt 2011-09-17 02:40:27 UTC (rev 95355)
@@ -31,12 +31,12 @@
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"
Modified: trunk/LayoutTests/css3/flexbox/script-tests/css-properties.js (95354 => 95355)
--- trunk/LayoutTests/css3/flexbox/script-tests/css-properties.js 2011-09-17 02:31:00 UTC (rev 95354)
+++ trunk/LayoutTests/css3/flexbox/script-tests/css-properties.js 2011-09-17 02:40:27 UTC (rev 95355)
@@ -76,17 +76,17 @@
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');
Modified: trunk/Source/WebCore/ChangeLog (95354 => 95355)
--- trunk/Source/WebCore/ChangeLog 2011-09-17 02:31:00 UTC (rev 95354)
+++ trunk/Source/WebCore/ChangeLog 2011-09-17 02:40:27 UTC (rev 95355)
@@ -1,3 +1,18 @@
+2011-09-16 Tony Chang <[email protected]>
+
+ 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 <[email protected]>
Implement an ErrorEvent constructor for JSC
Modified: trunk/Source/WebCore/css/CSSParser.cpp (95354 => 95355)
--- trunk/Source/WebCore/css/CSSParser.cpp 2011-09-17 02:31:00 UTC (rev 95354)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2011-09-17 02:40:27 UTC (rev 95355)
@@ -1580,7 +1580,7 @@
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.
Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (95354 => 95355)
--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2011-09-17 02:31:00 UTC (rev 95354)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2011-09-17 02:40:27 UTC (rev 95355)
@@ -1068,14 +1068,14 @@
, 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::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;
}
}
Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (95354 => 95355)
--- trunk/Source/WebCore/css/CSSValueKeywords.in 2011-09-17 02:31:00 UTC (rev 95354)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2011-09-17 02:40:27 UTC (rev 95355)
@@ -472,11 +472,11 @@
multiple
// CSS_PROP_FLEX_ALIGN
-before
-after
-// middle
+// start
+// end
+// center
+// baseline
// stretch
-// baseline
// CSS_PROP_FLEX_FLOW
// FIXME: Add the wrap values.
Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.h (95354 => 95355)
--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2011-09-17 02:31:00 UTC (rev 95354)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2011-09-17 02:40:27 UTC (rev 95355)
@@ -169,7 +169,7 @@
// 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};
