Diff
Modified: trunk/LayoutTests/ChangeLog (95858 => 95859)
--- trunk/LayoutTests/ChangeLog 2011-09-23 21:31:32 UTC (rev 95858)
+++ trunk/LayoutTests/ChangeLog 2011-09-23 21:35:30 UTC (rev 95859)
@@ -1,3 +1,13 @@
+2011-09-23 Ojan Vafai <[email protected]>
+
+ remove physical flex-flow values to match the updated spec
+ https://bugs.webkit.org/show_bug.cgi?id=68728
+
+ Reviewed by Tony Chang.
+
+ * css3/flexbox/css-properties-expected.txt:
+ * css3/flexbox/script-tests/css-properties.js:
+
2011-09-23 Abhishek Arya <[email protected]>
Style not updated for :before, :after content
Modified: trunk/LayoutTests/css3/flexbox/css-properties-expected.txt (95858 => 95859)
--- trunk/LayoutTests/css3/flexbox/css-properties-expected.txt 2011-09-23 21:31:32 UTC (rev 95858)
+++ trunk/LayoutTests/css3/flexbox/css-properties-expected.txt 2011-09-23 21:35:30 UTC (rev 95859)
@@ -54,22 +54,6 @@
PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column"
PASS flexbox.style.webkitFlexFlow is "column-reverse"
PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column-reverse"
-PASS flexbox.style.webkitFlexFlow is "horizontal"
-PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "horizontal"
-PASS flexbox.style.webkitFlexFlow is "horizontal-reverse"
-PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "horizontal-reverse"
-PASS flexbox.style.webkitFlexFlow is "horizontal-ltr"
-PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "horizontal-ltr"
-PASS flexbox.style.webkitFlexFlow is "horizontal-rtl"
-PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "horizontal-rtl"
-PASS flexbox.style.webkitFlexFlow is "vertical"
-PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "vertical"
-PASS flexbox.style.webkitFlexFlow is "vertical-reverse"
-PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "vertical-reverse"
-PASS flexbox.style.webkitFlexFlow is "vertical-ttb"
-PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "vertical-ttb"
-PASS flexbox.style.webkitFlexFlow is "vertical-btt"
-PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "vertical-btt"
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/css3/flexbox/script-tests/css-properties.js (95858 => 95859)
--- trunk/LayoutTests/css3/flexbox/script-tests/css-properties.js 2011-09-23 21:31:32 UTC (rev 95858)
+++ trunk/LayoutTests/css3/flexbox/script-tests/css-properties.js 2011-09-23 21:35:30 UTC (rev 95859)
@@ -122,36 +122,4 @@
shouldBeEqualToString('flexbox.style.webkitFlexFlow', 'column-reverse');
shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexFlow', 'column-reverse');
-flexbox.style.webkitFlexFlow = 'horizontal';
-shouldBeEqualToString('flexbox.style.webkitFlexFlow', 'horizontal');
-shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexFlow', 'horizontal');
-
-flexbox.style.webkitFlexFlow = 'horizontal-reverse';
-shouldBeEqualToString('flexbox.style.webkitFlexFlow', 'horizontal-reverse');
-shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexFlow', 'horizontal-reverse');
-
-flexbox.style.webkitFlexFlow = 'horizontal-ltr';
-shouldBeEqualToString('flexbox.style.webkitFlexFlow', 'horizontal-ltr');
-shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexFlow', 'horizontal-ltr');
-
-flexbox.style.webkitFlexFlow = 'horizontal-rtl';
-shouldBeEqualToString('flexbox.style.webkitFlexFlow', 'horizontal-rtl');
-shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexFlow', 'horizontal-rtl');
-
-flexbox.style.webkitFlexFlow = 'vertical';
-shouldBeEqualToString('flexbox.style.webkitFlexFlow', 'vertical');
-shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexFlow', 'vertical');
-
-flexbox.style.webkitFlexFlow = 'vertical-reverse';
-shouldBeEqualToString('flexbox.style.webkitFlexFlow', 'vertical-reverse');
-shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexFlow', 'vertical-reverse');
-
-flexbox.style.webkitFlexFlow = 'vertical-ttb';
-shouldBeEqualToString('flexbox.style.webkitFlexFlow', 'vertical-ttb');
-shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexFlow', 'vertical-ttb');
-
-flexbox.style.webkitFlexFlow = 'vertical-btt';
-shouldBeEqualToString('flexbox.style.webkitFlexFlow', 'vertical-btt');
-shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexFlow', 'vertical-btt');
-
successfullyParsed = true;
Modified: trunk/Source/WebCore/ChangeLog (95858 => 95859)
--- trunk/Source/WebCore/ChangeLog 2011-09-23 21:31:32 UTC (rev 95858)
+++ trunk/Source/WebCore/ChangeLog 2011-09-23 21:35:30 UTC (rev 95859)
@@ -1,3 +1,18 @@
+2011-09-23 Ojan Vafai <[email protected]>
+
+ remove physical flex-flow values to match the updated spec
+ https://bugs.webkit.org/show_bug.cgi?id=68728
+
+ Reviewed by Tony Chang.
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseValue):
+ * css/CSSPrimitiveValueMappings.h:
+ (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+ (WebCore::CSSPrimitiveValue::operator EFlexFlow):
+ * css/CSSValueKeywords.in:
+ * rendering/style/RenderStyleConstants.h:
+
2011-09-23 Abhishek Arya <[email protected]>
Style not updated for :before, :after content
Modified: trunk/Source/WebCore/css/CSSParser.cpp (95858 => 95859)
--- trunk/Source/WebCore/css/CSSParser.cpp 2011-09-23 21:31:32 UTC (rev 95858)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2011-09-23 21:35:30 UTC (rev 95859)
@@ -1589,9 +1589,7 @@
break;
case CSSPropertyWebkitFlexFlow:
// FIXME: -webkit-flex-flow takes a second "wrap" value.
- validPrimitive = id == CSSValueRow || id == CSSValueRowReverse || id == CSSValueColumn || id == CSSValueColumnReverse
- || id == CSSValueHorizontal || id == CSSValueHorizontalReverse || id == CSSValueHorizontalLtr || id == CSSValueHorizontalRtl
- || id == CSSValueVertical || id == CSSValueVerticalReverse || id == CSSValueVerticalTtb || id == CSSValueVerticalBtt;
+ validPrimitive = id == CSSValueRow || id == CSSValueRowReverse || id == CSSValueColumn || id == CSSValueColumnReverse;
break;
#endif
case CSSPropertyWebkitMarquee: {
Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (95858 => 95859)
--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2011-09-23 21:31:32 UTC (rev 95858)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2011-09-23 21:35:30 UTC (rev 95859)
@@ -1159,30 +1159,6 @@
case FlowColumnReverse:
m_value.ident = CSSValueColumnReverse;
break;
- case FlowHorizontal:
- m_value.ident = CSSValueHorizontal;
- break;
- case FlowHorizontalReverse:
- m_value.ident = CSSValueHorizontalReverse;
- break;
- case FlowHorizontalLeftToRight:
- m_value.ident = CSSValueHorizontalLtr;
- break;
- case FlowHorizontalRightToLeft:
- m_value.ident = CSSValueHorizontalRtl;
- break;
- case FlowVertical:
- m_value.ident = CSSValueVertical;
- break;
- case FlowVerticalReverse:
- m_value.ident = CSSValueVerticalReverse;
- break;
- case FlowVerticalTopToBottom:
- m_value.ident = CSSValueVerticalTtb;
- break;
- case FlowVerticalBottomToTop:
- m_value.ident = CSSValueVerticalBtt;
- break;
}
}
@@ -1197,22 +1173,6 @@
return FlowColumn;
case CSSValueColumnReverse:
return FlowColumnReverse;
- case CSSValueHorizontal:
- return FlowHorizontal;
- case CSSValueHorizontalReverse:
- return FlowHorizontalReverse;
- case CSSValueHorizontalLtr:
- return FlowHorizontalLeftToRight;
- case CSSValueHorizontalRtl:
- return FlowHorizontalRightToLeft;
- case CSSValueVertical:
- return FlowVertical;
- case CSSValueVerticalReverse:
- return FlowVerticalReverse;
- case CSSValueVerticalTtb:
- return FlowVerticalTopToBottom;
- case CSSValueVerticalBtt:
- return FlowVerticalBottomToTop;
default:
ASSERT_NOT_REACHED();
return FlowRow;
Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (95858 => 95859)
--- trunk/Source/WebCore/css/CSSValueKeywords.in 2011-09-23 21:31:32 UTC (rev 95858)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2011-09-23 21:35:30 UTC (rev 95859)
@@ -484,14 +484,6 @@
row-reverse
column
column-reverse
-// horizontal
-horizontal-reverse
-horizontal-ltr
-horizontal-rtl
-// vertical
-vertical-reverse
-vertical-ttb
-vertical-btt
// CSS_PROP_MARQUEE_DIRECTION
forwards
Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.h (95858 => 95859)
--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2011-09-23 21:31:32 UTC (rev 95858)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2011-09-23 21:35:30 UTC (rev 95859)
@@ -170,9 +170,7 @@
enum EFlexPack { PackStart, PackEnd, PackCenter, PackJustify };
enum EFlexAlign { AlignStart, AlignEnd, AlignCenter, AlignStretch, AlignBaseline };
-enum EFlexFlow { FlowRow, FlowRowReverse, FlowColumn, FlowColumnReverse,
- FlowHorizontal, FlowHorizontalReverse, FlowHorizontalLeftToRight, FlowHorizontalRightToLeft,
- FlowVertical, FlowVerticalReverse, FlowVerticalTopToBottom, FlowVerticalBottomToTop};
+enum EFlexFlow { FlowRow, FlowRowReverse, FlowColumn, FlowColumnReverse};
enum ETextSecurity {
TSNONE, TSDISC, TSCIRCLE, TSSQUARE
