Diff
Modified: trunk/LayoutTests/ChangeLog (105428 => 105429)
--- trunk/LayoutTests/ChangeLog 2012-01-19 19:00:36 UTC (rev 105428)
+++ trunk/LayoutTests/ChangeLog 2012-01-19 19:13:47 UTC (rev 105429)
@@ -1,3 +1,17 @@
+2012-01-19 David Hyatt <[email protected]>
+
+ https://bugs.webkit.org/show_bug.cgi?id=76644
+
+ Before landing support for centering, fix the keyword value to match the latest draft.
+ The new keyword is "contain" instead of "bounds."
+
+ Revised the existing parsing tests to reflect the updated value.
+
+ Reviewed by Dan Bernstein.
+
+ * fast/line-grid/line-grid-snap-parsing-expected.txt:
+ * fast/line-grid/script-tests/line-grid-snap-parsing.js:
+
2012-01-19 Mihnea Ovidenie <[email protected]>
[CSSRegions]Add support for background-color in region styling
Modified: trunk/LayoutTests/fast/line-grid/line-grid-snap-parsing-expected.txt (105428 => 105429)
--- trunk/LayoutTests/fast/line-grid/line-grid-snap-parsing-expected.txt 2012-01-19 19:00:36 UTC (rev 105428)
+++ trunk/LayoutTests/fast/line-grid/line-grid-snap-parsing-expected.txt 2012-01-19 19:13:47 UTC (rev 105429)
@@ -5,7 +5,7 @@
PASS test("-webkit-line-grid-snap: none") is "none"
PASS test("-webkit-line-grid-snap: baseline") is "baseline"
-PASS test("-webkit-line-grid-snap: bounds") is "bounds"
+PASS test("-webkit-line-grid-snap: contain") is "contain"
PASS test("-webkit-line-grid-snap: ;") is ""
PASS test("-webkit-line-grid-snap: 1") is ""
PASS test("-webkit-line-grid-snap: 1.2") is ""
@@ -16,7 +16,7 @@
PASS testComputedStyle("12px") is "none"
PASS testInherited("none") is "none"
PASS testInherited("baseline") is "baseline"
-PASS testInherited("bounds") is "bounds"
+PASS testInherited("contain") is "contain"
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/fast/line-grid/script-tests/line-grid-snap-parsing.js (105428 => 105429)
--- trunk/LayoutTests/fast/line-grid/script-tests/line-grid-snap-parsing.js 2012-01-19 19:00:36 UTC (rev 105428)
+++ trunk/LayoutTests/fast/line-grid/script-tests/line-grid-snap-parsing.js 2012-01-19 19:13:47 UTC (rev 105429)
@@ -33,7 +33,7 @@
shouldBeEqualToString('test("-webkit-line-grid-snap: none")', "none");
shouldBeEqualToString('test("-webkit-line-grid-snap: baseline")', "baseline");
-shouldBeEqualToString('test("-webkit-line-grid-snap: bounds")', "bounds");
+shouldBeEqualToString('test("-webkit-line-grid-snap: contain")', "contain");
shouldBeEqualToString('test("-webkit-line-grid-snap: ;")', "");
shouldBeEqualToString('test("-webkit-line-grid-snap: 1")', "");
shouldBeEqualToString('test("-webkit-line-grid-snap: 1.2")', "");
@@ -46,4 +46,4 @@
shouldBeEqualToString('testInherited("none")', "none");
shouldBeEqualToString('testInherited("baseline")', "baseline");
-shouldBeEqualToString('testInherited("bounds")', "bounds");
+shouldBeEqualToString('testInherited("contain")', "contain");
Modified: trunk/Source/WebCore/ChangeLog (105428 => 105429)
--- trunk/Source/WebCore/ChangeLog 2012-01-19 19:00:36 UTC (rev 105428)
+++ trunk/Source/WebCore/ChangeLog 2012-01-19 19:13:47 UTC (rev 105429)
@@ -1,3 +1,22 @@
+2012-01-19 David Hyatt <[email protected]>
+
+ https://bugs.webkit.org/show_bug.cgi?id=76644
+
+ Before landing support for centering, fix the keyword value to match the latest draft.
+ The new keyword is "contain" instead of "bounds."
+
+ Revised the existing parsing tests to reflect the updated value.
+
+ Reviewed by Dan Bernstein.
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseValue):
+ * css/CSSPrimitiveValueMappings.h:
+ (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+ (WebCore::CSSPrimitiveValue::operator LineGridSnap):
+ * css/CSSValueKeywords.in:
+ * rendering/style/RenderStyleConstants.h:
+
2012-01-19 Joi Sigurdsson <[email protected]>
Enable use of precompiled headers in Chromium port on Windows.
Modified: trunk/Source/WebCore/css/CSSParser.cpp (105428 => 105429)
--- trunk/Source/WebCore/css/CSSParser.cpp 2012-01-19 19:00:36 UTC (rev 105428)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2012-01-19 19:13:47 UTC (rev 105429)
@@ -1975,7 +1975,7 @@
}
break;
case CSSPropertyWebkitLineGridSnap:
- if (id == CSSValueNone || id == CSSValueBaseline || id == CSSValueBounds)
+ if (id == CSSValueNone || id == CSSValueBaseline || id == CSSValueContain)
validPrimitive = true;
break;
case CSSPropertyWebkitLocale:
Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (105428 => 105429)
--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2012-01-19 19:00:36 UTC (rev 105428)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2012-01-19 19:13:47 UTC (rev 105429)
@@ -3142,8 +3142,8 @@
case LineGridSnapBaseline:
m_value.ident = CSSValueBaseline;
break;
- case LineGridSnapBounds:
- m_value.ident = CSSValueBounds;
+ case LineGridSnapContain:
+ m_value.ident = CSSValueContain;
break;
}
}
@@ -3155,8 +3155,8 @@
return LineGridSnapNone;
case CSSValueBaseline:
return LineGridSnapBaseline;
- case CSSValueBounds:
- return LineGridSnapBounds;
+ case CSSValueContain:
+ return LineGridSnapContain;
default:
ASSERT_NOT_REACHED();
return LineGridSnapNone;
Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (105428 => 105429)
--- trunk/Source/WebCore/css/CSSValueKeywords.in 2012-01-19 19:00:36 UTC (rev 105428)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2012-01-19 19:13:47 UTC (rev 105429)
@@ -843,11 +843,6 @@
inline-box
replaced
-// -webkit-line-grid-snap
-//none
-//baseline
-bounds
-
// -webkit-font-feature-settings
on
off
Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.h (105428 => 105429)
--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2012-01-19 19:00:36 UTC (rev 105428)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2012-01-19 19:13:47 UTC (rev 105429)
@@ -460,7 +460,7 @@
enum ColumnAxis { HorizontalColumnAxis, VerticalColumnAxis, AutoColumnAxis };
-enum LineGridSnap { LineGridSnapNone, LineGridSnapBaseline, LineGridSnapBounds };
+enum LineGridSnap { LineGridSnapNone, LineGridSnapBaseline, LineGridSnapContain };
enum WrapFlow { WrapFlowAuto, WrapFlowBoth, WrapFlowLeft, WrapFlowRight, WrapFlowMaximum, WrapFlowClear };
