Diff
Modified: trunk/LayoutTests/ChangeLog (112586 => 112587)
--- trunk/LayoutTests/ChangeLog 2012-03-29 22:19:01 UTC (rev 112586)
+++ trunk/LayoutTests/ChangeLog 2012-03-29 22:21:01 UTC (rev 112587)
@@ -1,3 +1,17 @@
+2012-03-29 Bear Travis <[email protected]>
+
+ Update CSS Exclusion wrap-flow values left & right to start & end
+ https://bugs.webkit.org/show_bug.cgi?id=82366
+
+ Updating test values for the wrap-flow and wrap shorthand property
+
+ Reviewed by Andreas Kling.
+
+ * fast/exclusions/script-tests/wrap-flow-parsing.js:
+ * fast/exclusions/script-tests/wrap-parsing.js:
+ * fast/exclusions/wrap-flow-parsing-expected.txt:
+ * fast/exclusions/wrap-parsing-expected.txt:
+
2012-03-29 Enrica Casucci <[email protected]>
Skipping plugin mouse events tests failing on Mac platforms.
Modified: trunk/LayoutTests/fast/exclusions/script-tests/wrap-flow-parsing.js (112586 => 112587)
--- trunk/LayoutTests/fast/exclusions/script-tests/wrap-flow-parsing.js 2012-03-29 22:19:01 UTC (rev 112586)
+++ trunk/LayoutTests/fast/exclusions/script-tests/wrap-flow-parsing.js 2012-03-29 22:21:01 UTC (rev 112587)
@@ -34,8 +34,8 @@
shouldBeEqualToString('test("-webkit-wrap-flow: auto")', "auto");
shouldBeEqualToString('test("-webkit-wrap-flow: both")', "both");
-shouldBeEqualToString('test("-webkit-wrap-flow: left")', "left");
-shouldBeEqualToString('test("-webkit-wrap-flow: right")', "right");
+shouldBeEqualToString('test("-webkit-wrap-flow: start")', "start");
+shouldBeEqualToString('test("-webkit-wrap-flow: end")', "end");
shouldBeEqualToString('test("-webkit-wrap-flow: maximum")', "maximum");
shouldBeEqualToString('test("-webkit-wrap-flow: clear")', "clear");
@@ -48,6 +48,6 @@
shouldBeEqualToString('testComputedStyle("5")', "auto");
shouldBeEqualToString('testComputedStyle("\'string\'")', "auto");
-shouldBeEqualToString('testNotInherited("auto", "left")', "left");
-shouldBeEqualToString('testNotInherited("right", "auto")', "auto");
+shouldBeEqualToString('testNotInherited("auto", "start")', "start");
+shouldBeEqualToString('testNotInherited("end", "auto")', "auto");
shouldBeEqualToString('testNotInherited("both", "clear")', "clear");
Modified: trunk/LayoutTests/fast/exclusions/script-tests/wrap-parsing.js (112586 => 112587)
--- trunk/LayoutTests/fast/exclusions/script-tests/wrap-parsing.js 2012-03-29 22:19:01 UTC (rev 112586)
+++ trunk/LayoutTests/fast/exclusions/script-tests/wrap-parsing.js 2012-03-29 22:21:01 UTC (rev 112587)
@@ -18,8 +18,8 @@
}
shouldBeEqualToString('test("-webkit-wrap: auto")', "auto");
-shouldBeEqualToString('test("-webkit-wrap: left 1px")', "left 1px");
-shouldBeEqualToString('test("-webkit-wrap: right 1px 2px")', "right 1px 2px");
+shouldBeEqualToString('test("-webkit-wrap: start 1px")', "start 1px");
+shouldBeEqualToString('test("-webkit-wrap: end 1px 2px")', "end 1px 2px");
shouldBeEqualToString('test("-webkit-wrap: 5px both 10pt;")', "both 5px 10pt");
shouldBeEqualToString('test("-webkit-wrap: 2px 3px clear;")', "clear 2px 3px");
shouldBeEqualToString('test("-webkit-wrap: 5px maximum;")', "maximum 5px");
@@ -30,12 +30,12 @@
shouldBeEqualToString('test("-webkit-wrap: auto -5px;")', "");
shouldBeEqualToString('test("-webkit-wrap: auto both;")', "");
shouldBeEqualToString('test("-webkit-wrap: auto 1px -10px;")', "");
-shouldBeEqualToString('test("-webkit-wrap: -5px left;")', "");
-shouldBeEqualToString('test("-webkit-wrap: 5px right \'string\';")', "");
+shouldBeEqualToString('test("-webkit-wrap: -5px start;")', "");
+shouldBeEqualToString('test("-webkit-wrap: 5px end \'string\';")', "");
shouldBeEqualToString('testComputedStyle("auto")', "auto 0px 0px");
-shouldBeEqualToString('testComputedStyle("left 1px")', "left 1px 0px");
-shouldBeEqualToString('testComputedStyle("right 1px 2px")', "right 1px 2px");
+shouldBeEqualToString('testComputedStyle("start 1px")', "start 1px 0px");
+shouldBeEqualToString('testComputedStyle("end 1px 2px")', "end 1px 2px");
shouldBeEqualToString('testComputedStyle("5px maximum")', "maximum 5px 0px");
shouldBeEqualToString('testComputedStyle("5px")', "auto 5px 0px");
shouldBeEqualToString('testComputedStyle("5px 10px")', "auto 5px 10px");
Modified: trunk/LayoutTests/fast/exclusions/wrap-flow-parsing-expected.txt (112586 => 112587)
--- trunk/LayoutTests/fast/exclusions/wrap-flow-parsing-expected.txt 2012-03-29 22:19:01 UTC (rev 112586)
+++ trunk/LayoutTests/fast/exclusions/wrap-flow-parsing-expected.txt 2012-03-29 22:21:01 UTC (rev 112587)
@@ -5,8 +5,8 @@
PASS test("-webkit-wrap-flow: auto") is "auto"
PASS test("-webkit-wrap-flow: both") is "both"
-PASS test("-webkit-wrap-flow: left") is "left"
-PASS test("-webkit-wrap-flow: right") is "right"
+PASS test("-webkit-wrap-flow: start") is "start"
+PASS test("-webkit-wrap-flow: end") is "end"
PASS test("-webkit-wrap-flow: maximum") is "maximum"
PASS test("-webkit-wrap-flow: clear") is "clear"
PASS test("-webkit-wrap-flow: ;") is ""
@@ -16,8 +16,8 @@
PASS testComputedStyle("auto") is "auto"
PASS testComputedStyle("5") is "auto"
PASS testComputedStyle("'string'") is "auto"
-PASS testNotInherited("auto", "left") is "left"
-PASS testNotInherited("right", "auto") is "auto"
+PASS testNotInherited("auto", "start") is "start"
+PASS testNotInherited("end", "auto") is "auto"
PASS testNotInherited("both", "clear") is "clear"
PASS successfullyParsed is true
Modified: trunk/LayoutTests/fast/exclusions/wrap-parsing-expected.txt (112586 => 112587)
--- trunk/LayoutTests/fast/exclusions/wrap-parsing-expected.txt 2012-03-29 22:19:01 UTC (rev 112586)
+++ trunk/LayoutTests/fast/exclusions/wrap-parsing-expected.txt 2012-03-29 22:21:01 UTC (rev 112587)
@@ -4,8 +4,8 @@
PASS test("-webkit-wrap: auto") is "auto"
-PASS test("-webkit-wrap: left 1px") is "left 1px"
-PASS test("-webkit-wrap: right 1px 2px") is "right 1px 2px"
+PASS test("-webkit-wrap: start 1px") is "start 1px"
+PASS test("-webkit-wrap: end 1px 2px") is "end 1px 2px"
PASS test("-webkit-wrap: 5px both 10pt;") is "both 5px 10pt"
PASS test("-webkit-wrap: 2px 3px clear;") is "clear 2px 3px"
PASS test("-webkit-wrap: 5px maximum;") is "maximum 5px"
@@ -15,11 +15,11 @@
PASS test("-webkit-wrap: auto -5px;") is ""
PASS test("-webkit-wrap: auto both;") is ""
PASS test("-webkit-wrap: auto 1px -10px;") is ""
-PASS test("-webkit-wrap: -5px left;") is ""
-PASS test("-webkit-wrap: 5px right 'string';") is ""
+PASS test("-webkit-wrap: -5px start;") is ""
+PASS test("-webkit-wrap: 5px end 'string';") is ""
PASS testComputedStyle("auto") is "auto 0px 0px"
-PASS testComputedStyle("left 1px") is "left 1px 0px"
-PASS testComputedStyle("right 1px 2px") is "right 1px 2px"
+PASS testComputedStyle("start 1px") is "start 1px 0px"
+PASS testComputedStyle("end 1px 2px") is "end 1px 2px"
PASS testComputedStyle("5px maximum") is "maximum 5px 0px"
PASS testComputedStyle("5px") is "auto 5px 0px"
PASS testComputedStyle("5px 10px") is "auto 5px 10px"
Modified: trunk/Source/WebCore/ChangeLog (112586 => 112587)
--- trunk/Source/WebCore/ChangeLog 2012-03-29 22:19:01 UTC (rev 112586)
+++ trunk/Source/WebCore/ChangeLog 2012-03-29 22:21:01 UTC (rev 112587)
@@ -1,3 +1,22 @@
+2012-03-29 Bear Travis <[email protected]>
+
+ Update CSS Exclusion wrap-flow values left & right to start & end
+ https://bugs.webkit.org/show_bug.cgi?id=82366
+
+ http://dev.w3.org/csswg/css3-exclusions/
+ -webkit-wrap-flow now takes the values start and end rather than
+ left and right. Updating the code to reflect this. Functionality
+ is covered by existing tests.
+
+ Reviewed by Andreas Kling.
+
+ * css/CSSParser.cpp:
+ (WebCore::isValidKeywordPropertyAndValue):
+ * css/CSSPrimitiveValueMappings.h:
+ (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+ (WebCore::CSSPrimitiveValue::operator WrapFlow):
+ * rendering/style/RenderStyleConstants.h:
+
2012-03-29 Dirk Pranke <[email protected]>
rollout r112484, r112545, r112574
Modified: trunk/Source/WebCore/css/CSSParser.cpp (112586 => 112587)
--- trunk/Source/WebCore/css/CSSParser.cpp 2012-03-29 22:19:01 UTC (rev 112586)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2012-03-29 22:21:01 UTC (rev 112587)
@@ -775,7 +775,7 @@
return true;
break;
case CSSPropertyWebkitWrapFlow:
- if (valueID == CSSValueAuto || valueID == CSSValueBoth || valueID == CSSValueLeft || valueID == CSSValueRight || valueID == CSSValueMaximum || valueID == CSSValueClear)
+ if (valueID == CSSValueAuto || valueID == CSSValueBoth || valueID == CSSValueStart || valueID == CSSValueEnd || valueID == CSSValueMaximum || valueID == CSSValueClear)
return true;
break;
case CSSPropertyWebkitWrapThrough:
Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (112586 => 112587)
--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2012-03-29 22:19:01 UTC (rev 112586)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2012-03-29 22:21:01 UTC (rev 112587)
@@ -3704,11 +3704,11 @@
case WrapFlowBoth:
m_value.ident = CSSValueBoth;
break;
- case WrapFlowLeft:
- m_value.ident = CSSValueLeft;
+ case WrapFlowStart:
+ m_value.ident = CSSValueStart;
break;
- case WrapFlowRight:
- m_value.ident = CSSValueRight;
+ case WrapFlowEnd:
+ m_value.ident = CSSValueEnd;
break;
case WrapFlowMaximum:
m_value.ident = CSSValueMaximum;
@@ -3726,10 +3726,10 @@
return WrapFlowAuto;
case CSSValueBoth:
return WrapFlowBoth;
- case CSSValueLeft:
- return WrapFlowLeft;
- case CSSValueRight:
- return WrapFlowRight;
+ case CSSValueStart:
+ return WrapFlowStart;
+ case CSSValueEnd:
+ return WrapFlowEnd;
case CSSValueMaximum:
return WrapFlowMaximum;
case CSSValueClear:
Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.h (112586 => 112587)
--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2012-03-29 22:19:01 UTC (rev 112586)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2012-03-29 22:21:01 UTC (rev 112587)
@@ -459,7 +459,7 @@
enum LineAlign { LineAlignNone, LineAlignEdges };
-enum WrapFlow { WrapFlowAuto, WrapFlowBoth, WrapFlowLeft, WrapFlowRight, WrapFlowMaximum, WrapFlowClear };
+enum WrapFlow { WrapFlowAuto, WrapFlowBoth, WrapFlowStart, WrapFlowEnd, WrapFlowMaximum, WrapFlowClear };
enum WrapThrough { WrapThroughWrap, WrapThroughNone };
