Modified: trunk/LayoutTests/ChangeLog (90934 => 90935)
--- trunk/LayoutTests/ChangeLog 2011-07-13 18:40:12 UTC (rev 90934)
+++ trunk/LayoutTests/ChangeLog 2011-07-13 18:49:16 UTC (rev 90935)
@@ -1,3 +1,16 @@
+2011-07-13 Mihnea Ovidenie <[email protected]>
+
+ [CSSRegions]content:-webkit-from-flow not applied correctly
+ https://bugs.webkit.org/show_bug.cgi?id=64438
+
+ Reviewed by Tony Chang.
+
+ Correct the layout test for content:-webkit-from-flow parsing. Testing getComputedStyle values for content property
+ was not done properly, as "flow-name" was passed instead of "-webkit-from-flow:'flow-name'".
+
+ * fast/regions/content-webkit-from-flow-parsing-expected.txt:
+ * fast/regions/script-tests/content-webkit-from-flow-parsing.js:
+
2011-07-12 Philippe Normand <[email protected]>
[GTK] media/media-blocked-by-willsendrequest.html fails
Modified: trunk/LayoutTests/fast/regions/content-webkit-from-flow-parsing-expected.txt (90934 => 90935)
--- trunk/LayoutTests/fast/regions/content-webkit-from-flow-parsing-expected.txt 2011-07-13 18:40:12 UTC (rev 90934)
+++ trunk/LayoutTests/fast/regions/content-webkit-from-flow-parsing-expected.txt 2011-07-13 18:49:16 UTC (rev 90935)
@@ -18,20 +18,20 @@
PASS testCSSText("content: -webkit-from-flow(12px)") is ""
PASS testCSSText("content: -webkit-from-flow(first flow)") is ""
PASS testCSSText("content: -webkit-from-flow(first-flow)") is ""
-PASS testComputedStyle("'first-flow'") is "first-flow"
-PASS testComputedStyle("'first flow'") is "'first flow'"
-PASS testComputedStyle("'auto'") is "auto"
-PASS testComputedStyle("auto") is ""
-PASS testComputedStyle("initial") is ""
-PASS testComputedStyle("inherit") is ""
-PASS testComputedStyle("") is ""
-PASS testComputedStyle("1") is ""
-PASS testComputedStyle("1.2") is ""
-PASS testComputedStyle("-1") is ""
-PASS testComputedStyle("12px") is ""
-PASS testComputedStyle("''") is "''"
-PASS testComputedStyle("first flow") is ""
-PASS testComputedStyle("first-flow") is ""
+PASS testComputedStyle("-webkit-from-flow('first-flow')") is "first-flow"
+PASS testComputedStyle("-webkit-from-flow('first flow')") is "'first flow'"
+PASS testComputedStyle("-webkit-from-flow('auto')") is "auto"
+PASS testComputedStyle("-webkit-from-flow(auto)") is ""
+PASS testComputedStyle("-webkit-from-flow(initial)") is ""
+PASS testComputedStyle("-webkit-from-flow(inherit)") is ""
+PASS testComputedStyle("-webkit-from-flow()") is ""
+PASS testComputedStyle("-webkit-from-flow(1)") is ""
+PASS testComputedStyle("-webkit-from-flow(1.2)") is ""
+PASS testComputedStyle("-webkit-from-flow(-1)") is ""
+PASS testComputedStyle("-webkit-from-flow(12px)") is ""
+PASS testComputedStyle("-webkit-from-flow('')") is "''"
+PASS testComputedStyle("-webkit-from-flow(first flow)") is ""
+PASS testComputedStyle("-webkit-from-flow(first-flow)") is ""
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/fast/regions/script-tests/content-webkit-from-flow-parsing.js (90934 => 90935)
--- trunk/LayoutTests/fast/regions/script-tests/content-webkit-from-flow-parsing.js 2011-07-13 18:40:12 UTC (rev 90934)
+++ trunk/LayoutTests/fast/regions/script-tests/content-webkit-from-flow-parsing.js 2011-07-13 18:49:16 UTC (rev 90935)
@@ -32,19 +32,19 @@
shouldBeEqualToString('testCSSText("content: -webkit-from-flow(first flow)")', "");
shouldBeEqualToString('testCSSText("content: -webkit-from-flow(first-flow)")', "");
-shouldBeEqualToString('testComputedStyle("\'first-flow\'")', "first-flow");
-shouldBeEqualToString('testComputedStyle("\'first flow\'")', "'first flow'");
-shouldBeEqualToString('testComputedStyle("\'auto\'")', "auto");
-shouldBeEqualToString('testComputedStyle("auto")', "");
-shouldBeEqualToString('testComputedStyle("initial")', "");
-shouldBeEqualToString('testComputedStyle("inherit")', "");
-shouldBeEqualToString('testComputedStyle("")', "");
-shouldBeEqualToString('testComputedStyle("1")', "");
-shouldBeEqualToString('testComputedStyle("1.2")', "");
-shouldBeEqualToString('testComputedStyle("-1")', "");
-shouldBeEqualToString('testComputedStyle("12px")', "");
-shouldBeEqualToString('testComputedStyle("\'\'")', "''");
-shouldBeEqualToString('testComputedStyle("first flow")', "");
-shouldBeEqualToString('testComputedStyle("first-flow")', "");
+shouldBeEqualToString('testComputedStyle("-webkit-from-flow(\'first-flow\')")', "first-flow");
+shouldBeEqualToString('testComputedStyle("-webkit-from-flow(\'first flow\')")', "'first flow'");
+shouldBeEqualToString('testComputedStyle("-webkit-from-flow(\'auto\')")', "auto");
+shouldBeEqualToString('testComputedStyle("-webkit-from-flow(auto)")', "");
+shouldBeEqualToString('testComputedStyle("-webkit-from-flow(initial)")', "");
+shouldBeEqualToString('testComputedStyle("-webkit-from-flow(inherit)")', "");
+shouldBeEqualToString('testComputedStyle("-webkit-from-flow()")', "");
+shouldBeEqualToString('testComputedStyle("-webkit-from-flow(1)")', "");
+shouldBeEqualToString('testComputedStyle("-webkit-from-flow(1.2)")', "");
+shouldBeEqualToString('testComputedStyle("-webkit-from-flow(-1)")', "");
+shouldBeEqualToString('testComputedStyle("-webkit-from-flow(12px)")', "");
+shouldBeEqualToString('testComputedStyle("-webkit-from-flow(\'\')")', "''");
+shouldBeEqualToString('testComputedStyle("-webkit-from-flow(first flow)")', "");
+shouldBeEqualToString('testComputedStyle("-webkit-from-flow(first-flow)")', "");
successfullyParsed = true;
Modified: trunk/Source/WebCore/ChangeLog (90934 => 90935)
--- trunk/Source/WebCore/ChangeLog 2011-07-13 18:40:12 UTC (rev 90934)
+++ trunk/Source/WebCore/ChangeLog 2011-07-13 18:49:16 UTC (rev 90935)
@@ -1,3 +1,17 @@
+2011-07-13 Mihnea Ovidenie <[email protected]>
+
+ [CSSRegions]content:-webkit-from-flow not applied correctly
+ https://bugs.webkit.org/show_bug.cgi?id=64438
+
+ Reviewed by Tony Chang.
+
+ Forgot to modify getStringValue(), i was modifying only getStringValue(ExceptionCode&).
+
+ Test: fast/regions/content-webkit-from-flow-parsing.html (existing).
+
+ * css/CSSPrimitiveValue.cpp:
+ (WebCore::CSSPrimitiveValue::getStringValue):
+
2011-07-12 Ryosuke Niwa <[email protected]>
Don't reuse the last InsertTextCommand
Modified: trunk/Source/WebCore/css/CSSPrimitiveValue.cpp (90934 => 90935)
--- trunk/Source/WebCore/css/CSSPrimitiveValue.cpp 2011-07-13 18:40:12 UTC (rev 90934)
+++ trunk/Source/WebCore/css/CSSPrimitiveValue.cpp 2011-07-13 18:49:16 UTC (rev 90935)
@@ -545,6 +545,9 @@
case CSS_STRING:
case CSS_ATTR:
case CSS_URI:
+#if ENABLE(CSS_REGIONS)
+ case CSS_FROM_FLOW:
+#endif
return m_value.string;
case CSS_IDENT:
return valueOrPropertyName(m_value.ident);
