Diff
Modified: trunk/LayoutTests/ChangeLog (113327 => 113328)
--- trunk/LayoutTests/ChangeLog 2012-04-05 16:39:54 UTC (rev 113327)
+++ trunk/LayoutTests/ChangeLog 2012-04-05 16:41:51 UTC (rev 113328)
@@ -1,3 +1,18 @@
+2012-04-05 Hans Muller <[email protected]>
+
+ Rename CSS Exclusions "rect" value to "rectangle"
+ https://bugs.webkit.org/show_bug.cgi?id=82367
+
+ Reviewed by Ryosuke Niwa.
+
+ Changed the CSS exclusion shape called "rect" to "rectangle" to match
+ the current draft spec - http://dev.w3.org/csswg/css3-exclusions.
+
+ * fast/exclusions/parsing-wrap-shape-inside-expected.txt:
+ * fast/exclusions/parsing-wrap-shape-outside-expected.txt:
+ * fast/exclusions/script-tests/parsing-wrap-shape-inside.js:
+ * fast/exclusions/script-tests/parsing-wrap-shape-outside.js:
+
2012-04-05 Dimitri Glazkov <[email protected]>
[Chromium] Marked fast/filesystem/file-writer-abort-continue.html as flaky crash
Modified: trunk/LayoutTests/fast/exclusions/parsing-wrap-shape-inside-expected.txt (113327 => 113328)
--- trunk/LayoutTests/fast/exclusions/parsing-wrap-shape-inside-expected.txt 2012-04-05 16:39:54 UTC (rev 113327)
+++ trunk/LayoutTests/fast/exclusions/parsing-wrap-shape-inside-expected.txt 2012-04-05 16:41:51 UTC (rev 113328)
@@ -5,12 +5,12 @@
PASS testCSSText("auto") is "auto"
PASS testComputedStyle("auto") is "auto"
-PASS testCSSText("rect(10px, 20px, 30px, 40px)") is "rect(10px, 20px, 30px, 40px)"
-PASS testComputedStyle("rect(10px, 20px, 30px, 40px)") is "rect(10px, 20px, 30px, 40px)"
-PASS testCSSText("rect(10px, 20px, 30px, 40px, 5px)") is "rect(10px, 20px, 30px, 40px, 5px)"
-PASS testComputedStyle("rect(10px, 20px, 30px, 40px, 5px)") is "rect(10px, 20px, 30px, 40px, 5px)"
-PASS testCSSText("rect(10px, 20px, 30px, 40px, 5px, 10px)") is "rect(10px, 20px, 30px, 40px, 5px, 10px)"
-PASS testComputedStyle("rect(10px, 20px, 30px, 40px, 5px, 10px)") is "rect(10px, 20px, 30px, 40px, 5px, 10px)"
+PASS testCSSText("rectangle(10px, 20px, 30px, 40px)") is "rectangle(10px, 20px, 30px, 40px)"
+PASS testComputedStyle("rectangle(10px, 20px, 30px, 40px)") is "rectangle(10px, 20px, 30px, 40px)"
+PASS testCSSText("rectangle(10px, 20px, 30px, 40px, 5px)") is "rectangle(10px, 20px, 30px, 40px, 5px)"
+PASS testComputedStyle("rectangle(10px, 20px, 30px, 40px, 5px)") is "rectangle(10px, 20px, 30px, 40px, 5px)"
+PASS testCSSText("rectangle(10px, 20px, 30px, 40px, 5px, 10px)") is "rectangle(10px, 20px, 30px, 40px, 5px, 10px)"
+PASS testComputedStyle("rectangle(10px, 20px, 30px, 40px, 5px, 10px)") is "rectangle(10px, 20px, 30px, 40px, 5px, 10px)"
PASS testCSSText("circle(10px, 20px, 30px)") is "circle(10px, 20px, 30px)"
PASS testComputedStyle("circle(10px, 20px, 30px)") is "circle(10px, 20px, 30px)"
PASS testCSSText("ellipse(10px, 20px, 30px, 40px)") is "ellipse(10px, 20px, 30px, 40px)"
@@ -21,28 +21,28 @@
PASS testComputedStyle("polygon(evenodd, 10px, 20px 30px, 40px 40px, 50px)") is "polygon(evenodd, 10px, 20px 30px, 40px 40px, 50px)"
PASS testCSSText("polygon(nonzero, 10px, 20px 30px, 40px 40px, 50px)") is "polygon(nonzero, 10px, 20px 30px, 40px 40px, 50px)"
PASS testComputedStyle("polygon(nonzero, 10px, 20px 30px, 40px 40px, 50px)") is "polygon(nonzero, 10px, 20px 30px, 40px 40px, 50px)"
-PASS testNotInherited("auto", "rect(10px, 20px, 30px, 40px)") is "parent: auto, child: rect(10px, 20px, 30px, 40px)"
-PASS testNotInherited("rect(10px, 20px, 30px, 40px)", "initial") is "parent: rect(10px, 20px, 30px, 40px), child: auto"
-PASS testNotInherited("rect(10px, 20px, 30px, 40px)", "") is "parent: rect(10px, 20px, 30px, 40px), child: auto"
-PASS testNotInherited("rect(10px, 20px, 30px, 40px)", "inherit") is "parent: rect(10px, 20px, 30px, 40px), child: rect(10px, 20px, 30px, 40px)"
+PASS testNotInherited("auto", "rectangle(10px, 20px, 30px, 40px)") is "parent: auto, child: rectangle(10px, 20px, 30px, 40px)"
+PASS testNotInherited("rectangle(10px, 20px, 30px, 40px)", "initial") is "parent: rectangle(10px, 20px, 30px, 40px), child: auto"
+PASS testNotInherited("rectangle(10px, 20px, 30px, 40px)", "") is "parent: rectangle(10px, 20px, 30px, 40px), child: auto"
+PASS testNotInherited("rectangle(10px, 20px, 30px, 40px)", "inherit") is "parent: rectangle(10px, 20px, 30px, 40px), child: rectangle(10px, 20px, 30px, 40px)"
PASS testNotInherited("", "inherit") is "parent: auto, child: auto"
PASS testNotInherited("auto", "inherit") is "parent: auto, child: auto"
PASS testCSSText("calc()") is ""
PASS testComputedStyle("calc()") is "auto"
PASS testCSSText("none") is ""
PASS testComputedStyle("none") is "auto"
-PASS testCSSText("rect()") is ""
-PASS testComputedStyle("rect()") is "auto"
-PASS testCSSText("rect(10px)") is ""
-PASS testComputedStyle("rect(10px)") is "auto"
-PASS testCSSText("rect(10px, 10px)") is ""
-PASS testComputedStyle("rect(10px, 10px)") is "auto"
-PASS testCSSText("rect(10px, 20px, 30px)") is ""
-PASS testComputedStyle("rect(10px, 20px, 30px)") is "auto"
-PASS testCSSText("rect(10px 20px 30px 40px)") is ""
-PASS testComputedStyle("rect(10px 20px 30px 40px)") is "auto"
-PASS testCSSText("rect(10px, 20px, 30px, 40px, 50px, 60px, 70px)") is ""
-PASS testComputedStyle("rect(10px, 20px, 30px, 40px, 50px, 60px, 70px)") is "auto"
+PASS testCSSText("rectangle()") is ""
+PASS testComputedStyle("rectangle()") is "auto"
+PASS testCSSText("rectangle(10px)") is ""
+PASS testComputedStyle("rectangle(10px)") is "auto"
+PASS testCSSText("rectangle(10px, 10px)") is ""
+PASS testComputedStyle("rectangle(10px, 10px)") is "auto"
+PASS testCSSText("rectangle(10px, 20px, 30px)") is ""
+PASS testComputedStyle("rectangle(10px, 20px, 30px)") is "auto"
+PASS testCSSText("rectangle(10px 20px 30px 40px)") is ""
+PASS testComputedStyle("rectangle(10px 20px 30px 40px)") is "auto"
+PASS testCSSText("rectangle(10px, 20px, 30px, 40px, 50px, 60px, 70px)") is ""
+PASS testComputedStyle("rectangle(10px, 20px, 30px, 40px, 50px, 60px, 70px)") is "auto"
PASS testCSSText("circle()") is ""
PASS testComputedStyle("circle()") is "auto"
PASS testCSSText("circle(10px)") is ""
Modified: trunk/LayoutTests/fast/exclusions/parsing-wrap-shape-outside-expected.txt (113327 => 113328)
--- trunk/LayoutTests/fast/exclusions/parsing-wrap-shape-outside-expected.txt 2012-04-05 16:39:54 UTC (rev 113327)
+++ trunk/LayoutTests/fast/exclusions/parsing-wrap-shape-outside-expected.txt 2012-04-05 16:41:51 UTC (rev 113328)
@@ -5,12 +5,12 @@
PASS testCSSText("auto") is "auto"
PASS testComputedStyle("auto") is "auto"
-PASS testCSSText("rect(10px, 20px, 30px, 40px)") is "rect(10px, 20px, 30px, 40px)"
-PASS testComputedStyle("rect(10px, 20px, 30px, 40px)") is "rect(10px, 20px, 30px, 40px)"
-PASS testCSSText("rect(10px, 20px, 30px, 40px, 5px)") is "rect(10px, 20px, 30px, 40px, 5px)"
-PASS testComputedStyle("rect(10px, 20px, 30px, 40px, 5px)") is "rect(10px, 20px, 30px, 40px, 5px)"
-PASS testCSSText("rect(10px, 20px, 30px, 40px, 5px, 10px)") is "rect(10px, 20px, 30px, 40px, 5px, 10px)"
-PASS testComputedStyle("rect(10px, 20px, 30px, 40px, 5px, 10px)") is "rect(10px, 20px, 30px, 40px, 5px, 10px)"
+PASS testCSSText("rectangle(10px, 20px, 30px, 40px)") is "rectangle(10px, 20px, 30px, 40px)"
+PASS testComputedStyle("rectangle(10px, 20px, 30px, 40px)") is "rectangle(10px, 20px, 30px, 40px)"
+PASS testCSSText("rectangle(10px, 20px, 30px, 40px, 5px)") is "rectangle(10px, 20px, 30px, 40px, 5px)"
+PASS testComputedStyle("rectangle(10px, 20px, 30px, 40px, 5px)") is "rectangle(10px, 20px, 30px, 40px, 5px)"
+PASS testCSSText("rectangle(10px, 20px, 30px, 40px, 5px, 10px)") is "rectangle(10px, 20px, 30px, 40px, 5px, 10px)"
+PASS testComputedStyle("rectangle(10px, 20px, 30px, 40px, 5px, 10px)") is "rectangle(10px, 20px, 30px, 40px, 5px, 10px)"
PASS testCSSText("circle(10px, 20px, 30px)") is "circle(10px, 20px, 30px)"
PASS testComputedStyle("circle(10px, 20px, 30px)") is "circle(10px, 20px, 30px)"
PASS testCSSText("ellipse(10px, 20px, 30px, 40px)") is "ellipse(10px, 20px, 30px, 40px)"
@@ -21,28 +21,28 @@
PASS testComputedStyle("polygon(evenodd, 10px, 20px 30px, 40px 40px, 50px)") is "polygon(evenodd, 10px, 20px 30px, 40px 40px, 50px)"
PASS testCSSText("polygon(nonzero, 10px, 20px 30px, 40px 40px, 50px)") is "polygon(nonzero, 10px, 20px 30px, 40px 40px, 50px)"
PASS testComputedStyle("polygon(nonzero, 10px, 20px 30px, 40px 40px, 50px)") is "polygon(nonzero, 10px, 20px 30px, 40px 40px, 50px)"
-PASS testNotInherited("auto", "rect(10px, 20px, 30px, 40px)") is "parent: auto, child: rect(10px, 20px, 30px, 40px)"
-PASS testNotInherited("rect(10px, 20px, 30px, 40px)", "initial") is "parent: rect(10px, 20px, 30px, 40px), child: auto"
-PASS testNotInherited("rect(10px, 20px, 30px, 40px)", "") is "parent: rect(10px, 20px, 30px, 40px), child: auto"
-PASS testNotInherited("rect(10px, 20px, 30px, 40px)", "inherit") is "parent: rect(10px, 20px, 30px, 40px), child: rect(10px, 20px, 30px, 40px)"
+PASS testNotInherited("auto", "rectangle(10px, 20px, 30px, 40px)") is "parent: auto, child: rectangle(10px, 20px, 30px, 40px)"
+PASS testNotInherited("rectangle(10px, 20px, 30px, 40px)", "initial") is "parent: rectangle(10px, 20px, 30px, 40px), child: auto"
+PASS testNotInherited("rectangle(10px, 20px, 30px, 40px)", "") is "parent: rectangle(10px, 20px, 30px, 40px), child: auto"
+PASS testNotInherited("rectangle(10px, 20px, 30px, 40px)", "inherit") is "parent: rectangle(10px, 20px, 30px, 40px), child: rectangle(10px, 20px, 30px, 40px)"
PASS testNotInherited("", "inherit") is "parent: auto, child: auto"
PASS testNotInherited("auto", "inherit") is "parent: auto, child: auto"
PASS testCSSText("calc()") is ""
PASS testComputedStyle("calc()") is "auto"
PASS testCSSText("none") is ""
PASS testComputedStyle("none") is "auto"
-PASS testCSSText("rect()") is ""
-PASS testComputedStyle("rect()") is "auto"
-PASS testCSSText("rect(10px)") is ""
-PASS testComputedStyle("rect(10px)") is "auto"
-PASS testCSSText("rect(10px, 10px)") is ""
-PASS testComputedStyle("rect(10px, 10px)") is "auto"
-PASS testCSSText("rect(10px, 20px, 30px)") is ""
-PASS testComputedStyle("rect(10px, 20px, 30px)") is "auto"
-PASS testCSSText("rect(10px 20px 30px 40px)") is ""
-PASS testComputedStyle("rect(10px 20px 30px 40px)") is "auto"
-PASS testCSSText("rect(10px, 20px, 30px, 40px, 50px, 60px, 70px)") is ""
-PASS testComputedStyle("rect(10px, 20px, 30px, 40px, 50px, 60px, 70px)") is "auto"
+PASS testCSSText("rectangle()") is ""
+PASS testComputedStyle("rectangle()") is "auto"
+PASS testCSSText("rectangle(10px)") is ""
+PASS testComputedStyle("rectangle(10px)") is "auto"
+PASS testCSSText("rectangle(10px, 10px)") is ""
+PASS testComputedStyle("rectangle(10px, 10px)") is "auto"
+PASS testCSSText("rectangle(10px, 20px, 30px)") is ""
+PASS testComputedStyle("rectangle(10px, 20px, 30px)") is "auto"
+PASS testCSSText("rectangle(10px 20px 30px 40px)") is ""
+PASS testComputedStyle("rectangle(10px 20px 30px 40px)") is "auto"
+PASS testCSSText("rectangle(10px, 20px, 30px, 40px, 50px, 60px, 70px)") is ""
+PASS testComputedStyle("rectangle(10px, 20px, 30px, 40px, 50px, 60px, 70px)") is "auto"
PASS testCSSText("circle()") is ""
PASS testComputedStyle("circle()") is "auto"
PASS testCSSText("circle(10px)") is ""
Modified: trunk/LayoutTests/fast/exclusions/script-tests/parsing-wrap-shape-inside.js (113327 => 113328)
--- trunk/LayoutTests/fast/exclusions/script-tests/parsing-wrap-shape-inside.js 2012-04-05 16:39:54 UTC (rev 113327)
+++ trunk/LayoutTests/fast/exclusions/script-tests/parsing-wrap-shape-inside.js 2012-04-05 16:41:51 UTC (rev 113328)
@@ -55,9 +55,9 @@
// positive tests
test("auto", "auto");
-test("rect(10px, 20px, 30px, 40px)", "rect(10px, 20px, 30px, 40px)");
-test("rect(10px, 20px, 30px, 40px, 5px)", "rect(10px, 20px, 30px, 40px, 5px)");
-test("rect(10px, 20px, 30px, 40px, 5px, 10px)", "rect(10px, 20px, 30px, 40px, 5px, 10px)");
+test("rectangle(10px, 20px, 30px, 40px)", "rectangle(10px, 20px, 30px, 40px)");
+test("rectangle(10px, 20px, 30px, 40px, 5px)", "rectangle(10px, 20px, 30px, 40px, 5px)");
+test("rectangle(10px, 20px, 30px, 40px, 5px, 10px)", "rectangle(10px, 20px, 30px, 40px, 5px, 10px)");
test("circle(10px, 20px, 30px)", "circle(10px, 20px, 30px)");
@@ -67,10 +67,10 @@
test("polygon(evenodd, 10px, 20px 30px, 40px 40px, 50px)", "polygon(evenodd, 10px, 20px 30px, 40px 40px, 50px)");
test("polygon(nonzero, 10px, 20px 30px, 40px 40px, 50px)", "polygon(nonzero, 10px, 20px 30px, 40px 40px, 50px)");
-shouldBeEqualToString('testNotInherited("auto", "rect(10px, 20px, 30px, 40px)")', "parent: auto, child: rect(10px, 20px, 30px, 40px)");
-shouldBeEqualToString('testNotInherited("rect(10px, 20px, 30px, 40px)", "initial")', "parent: rect(10px, 20px, 30px, 40px), child: auto");
-shouldBeEqualToString('testNotInherited("rect(10px, 20px, 30px, 40px)", "")', "parent: rect(10px, 20px, 30px, 40px), child: auto");
-shouldBeEqualToString('testNotInherited("rect(10px, 20px, 30px, 40px)", "inherit")', "parent: rect(10px, 20px, 30px, 40px), child: rect(10px, 20px, 30px, 40px)");
+shouldBeEqualToString('testNotInherited("auto", "rectangle(10px, 20px, 30px, 40px)")', "parent: auto, child: rectangle(10px, 20px, 30px, 40px)");
+shouldBeEqualToString('testNotInherited("rectangle(10px, 20px, 30px, 40px)", "initial")', "parent: rectangle(10px, 20px, 30px, 40px), child: auto");
+shouldBeEqualToString('testNotInherited("rectangle(10px, 20px, 30px, 40px)", "")', "parent: rectangle(10px, 20px, 30px, 40px), child: auto");
+shouldBeEqualToString('testNotInherited("rectangle(10px, 20px, 30px, 40px)", "inherit")', "parent: rectangle(10px, 20px, 30px, 40px), child: rectangle(10px, 20px, 30px, 40px)");
shouldBeEqualToString('testNotInherited("", "inherit")', "parent: auto, child: auto");
shouldBeEqualToString('testNotInherited("auto", "inherit")', "parent: auto, child: auto");
@@ -79,12 +79,12 @@
negative_test("calc()");
negative_test("none");
-negative_test("rect()");
-negative_test("rect(10px)");
-negative_test("rect(10px, 10px)");
-negative_test("rect(10px, 20px, 30px)");
-negative_test("rect(10px 20px 30px 40px)");
-negative_test("rect(10px, 20px, 30px, 40px, 50px, 60px, 70px)");
+negative_test("rectangle()");
+negative_test("rectangle(10px)");
+negative_test("rectangle(10px, 10px)");
+negative_test("rectangle(10px, 20px, 30px)");
+negative_test("rectangle(10px 20px 30px 40px)");
+negative_test("rectangle(10px, 20px, 30px, 40px, 50px, 60px, 70px)");
negative_test("circle()");
negative_test("circle(10px)");
Modified: trunk/LayoutTests/fast/exclusions/script-tests/parsing-wrap-shape-outside.js (113327 => 113328)
--- trunk/LayoutTests/fast/exclusions/script-tests/parsing-wrap-shape-outside.js 2012-04-05 16:39:54 UTC (rev 113327)
+++ trunk/LayoutTests/fast/exclusions/script-tests/parsing-wrap-shape-outside.js 2012-04-05 16:41:51 UTC (rev 113328)
@@ -55,9 +55,9 @@
// positive tests
test("auto", "auto");
-test("rect(10px, 20px, 30px, 40px)", "rect(10px, 20px, 30px, 40px)");
-test("rect(10px, 20px, 30px, 40px, 5px)", "rect(10px, 20px, 30px, 40px, 5px)");
-test("rect(10px, 20px, 30px, 40px, 5px, 10px)", "rect(10px, 20px, 30px, 40px, 5px, 10px)");
+test("rectangle(10px, 20px, 30px, 40px)", "rectangle(10px, 20px, 30px, 40px)");
+test("rectangle(10px, 20px, 30px, 40px, 5px)", "rectangle(10px, 20px, 30px, 40px, 5px)");
+test("rectangle(10px, 20px, 30px, 40px, 5px, 10px)", "rectangle(10px, 20px, 30px, 40px, 5px, 10px)");
test("circle(10px, 20px, 30px)", "circle(10px, 20px, 30px)");
@@ -67,10 +67,10 @@
test("polygon(evenodd, 10px, 20px 30px, 40px 40px, 50px)", "polygon(evenodd, 10px, 20px 30px, 40px 40px, 50px)");
test("polygon(nonzero, 10px, 20px 30px, 40px 40px, 50px)", "polygon(nonzero, 10px, 20px 30px, 40px 40px, 50px)");
-shouldBeEqualToString('testNotInherited("auto", "rect(10px, 20px, 30px, 40px)")', "parent: auto, child: rect(10px, 20px, 30px, 40px)");
-shouldBeEqualToString('testNotInherited("rect(10px, 20px, 30px, 40px)", "initial")', "parent: rect(10px, 20px, 30px, 40px), child: auto");
-shouldBeEqualToString('testNotInherited("rect(10px, 20px, 30px, 40px)", "")', "parent: rect(10px, 20px, 30px, 40px), child: auto");
-shouldBeEqualToString('testNotInherited("rect(10px, 20px, 30px, 40px)", "inherit")', "parent: rect(10px, 20px, 30px, 40px), child: rect(10px, 20px, 30px, 40px)");
+shouldBeEqualToString('testNotInherited("auto", "rectangle(10px, 20px, 30px, 40px)")', "parent: auto, child: rectangle(10px, 20px, 30px, 40px)");
+shouldBeEqualToString('testNotInherited("rectangle(10px, 20px, 30px, 40px)", "initial")', "parent: rectangle(10px, 20px, 30px, 40px), child: auto");
+shouldBeEqualToString('testNotInherited("rectangle(10px, 20px, 30px, 40px)", "")', "parent: rectangle(10px, 20px, 30px, 40px), child: auto");
+shouldBeEqualToString('testNotInherited("rectangle(10px, 20px, 30px, 40px)", "inherit")', "parent: rectangle(10px, 20px, 30px, 40px), child: rectangle(10px, 20px, 30px, 40px)");
shouldBeEqualToString('testNotInherited("", "inherit")', "parent: auto, child: auto");
shouldBeEqualToString('testNotInherited("auto", "inherit")', "parent: auto, child: auto");
@@ -79,12 +79,12 @@
negative_test("calc()");
negative_test("none");
-negative_test("rect()");
-negative_test("rect(10px)");
-negative_test("rect(10px, 10px)");
-negative_test("rect(10px, 20px, 30px)");
-negative_test("rect(10px 20px 30px 40px)");
-negative_test("rect(10px, 20px, 30px, 40px, 50px, 60px, 70px)");
+negative_test("rectangle()");
+negative_test("rectangle(10px)");
+negative_test("rectangle(10px, 10px)");
+negative_test("rectangle(10px, 20px, 30px)");
+negative_test("rectangle(10px 20px 30px 40px)");
+negative_test("rectangle(10px, 20px, 30px, 40px, 50px, 60px, 70px)");
negative_test("circle()");
negative_test("circle(10px)");
Modified: trunk/Source/WebCore/ChangeLog (113327 => 113328)
--- trunk/Source/WebCore/ChangeLog 2012-04-05 16:39:54 UTC (rev 113327)
+++ trunk/Source/WebCore/ChangeLog 2012-04-05 16:41:51 UTC (rev 113328)
@@ -1,3 +1,29 @@
+2012-04-05 Hans Muller <[email protected]>
+
+ Rename CSS Exclusions "rect" value to "rectangle"
+ https://bugs.webkit.org/show_bug.cgi?id=82367
+
+ Reviewed by Ryosuke Niwa.
+
+ Changed the CSS exclusion shape called "rect" to "rectangle" to match
+ the current draft spec - http://dev.w3.org/csswg/css3-exclusions.
+
+ The meeting minutes where the decision to rename the exclusion "rect" function
+ to "rectangle" are: http://lists.w3.org/Archives/Public/www-style/2012Feb/0325.html
+
+ No new tests were created; just updated the existing ones.
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseWrapShapeRectangle):
+ (WebCore::CSSParser::parseWrapShape):
+ * css/CSSParser.h:
+ * css/CSSWrapShapes.cpp:
+ (WebCore::CSSWrapShapeRectangle::cssText):
+ * css/CSSWrapShapes.h:
+ (WebCore::CSSWrapShapeRectangle::create):
+ (WebCore::CSSWrapShapeRectangle::type):
+ (WebCore::CSSWrapShapeRectangle::CSSWrapShapeRectangle):
+
2012-04-05 Arvid Nilsson <[email protected]>
[BlackBerry] Disable paintingGoesToWindow() for the root layer when forced compositing mode is active
Modified: trunk/Source/WebCore/css/CSSParser.cpp (113327 => 113328)
--- trunk/Source/WebCore/css/CSSParser.cpp 2012-04-05 16:39:54 UTC (rev 113327)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2012-04-05 16:41:51 UTC (rev 113328)
@@ -4092,7 +4092,7 @@
return false;
}
-PassRefPtr<CSSWrapShape> CSSParser::parseExclusionShapeRect(CSSParserValueList* args)
+PassRefPtr<CSSWrapShape> CSSParser::parseExclusionShapeRectangle(CSSParserValueList* args)
{
ASSERT(args);
@@ -4100,7 +4100,7 @@
if (args->size() != 7 && args->size() != 9 && args->size() != 11)
return 0;
- RefPtr<CSSWrapShapeRect> shape = CSSWrapShapeRect::create();
+ RefPtr<CSSWrapShapeRectangle> shape = CSSWrapShapeRectangle::create();
unsigned argumentNumber = 0;
CSSParserValue* argument = args->current();
@@ -4295,8 +4295,8 @@
RefPtr<CSSWrapShape> shape;
- if (equalIgnoringCase(value->function->name, "rect("))
- shape = parseExclusionShapeRect(args);
+ if (equalIgnoringCase(value->function->name, "rectangle("))
+ shape = parseExclusionShapeRectangle(args);
else if (equalIgnoringCase(value->function->name, "circle("))
shape = parseExclusionShapeCircle(args);
else if (equalIgnoringCase(value->function->name, "ellipse("))
Modified: trunk/Source/WebCore/css/CSSParser.h (113327 => 113328)
--- trunk/Source/WebCore/css/CSSParser.h 2012-04-05 16:39:54 UTC (rev 113327)
+++ trunk/Source/WebCore/css/CSSParser.h 2012-04-05 16:41:51 UTC (rev 113328)
@@ -143,7 +143,7 @@
bool parseClipShape(CSSPropertyID, bool important);
bool parseExclusionShape(bool shapeInside, bool important);
- PassRefPtr<CSSWrapShape> parseExclusionShapeRect(CSSParserValueList* args);
+ PassRefPtr<CSSWrapShape> parseExclusionShapeRectangle(CSSParserValueList* args);
PassRefPtr<CSSWrapShape> parseExclusionShapeCircle(CSSParserValueList* args);
PassRefPtr<CSSWrapShape> parseExclusionShapeEllipse(CSSParserValueList* args);
PassRefPtr<CSSWrapShape> parseExclusionShapePolygon(CSSParserValueList* args);
Modified: trunk/Source/WebCore/css/CSSWrapShapes.cpp (113327 => 113328)
--- trunk/Source/WebCore/css/CSSWrapShapes.cpp 2012-04-05 16:39:54 UTC (rev 113327)
+++ trunk/Source/WebCore/css/CSSWrapShapes.cpp 2012-04-05 16:41:51 UTC (rev 113328)
@@ -37,14 +37,14 @@
namespace WebCore {
-String CSSWrapShapeRect::cssText() const
+String CSSWrapShapeRectangle::cssText() const
{
- DEFINE_STATIC_LOCAL(const String, rectParen, ("rect("));
+ DEFINE_STATIC_LOCAL(const String, rectangleParen, ("rectangle("));
DEFINE_STATIC_LOCAL(const String, comma, (", "));
StringBuilder result;
result.reserveCapacity(32);
- result.append(rectParen);
+ result.append(rectangleParen);
result.append(m_left->cssText());
result.append(comma);
Modified: trunk/Source/WebCore/css/CSSWrapShapes.h (113327 => 113328)
--- trunk/Source/WebCore/css/CSSWrapShapes.h 2012-04-05 16:39:54 UTC (rev 113327)
+++ trunk/Source/WebCore/css/CSSWrapShapes.h 2012-04-05 16:41:51 UTC (rev 113328)
@@ -41,7 +41,7 @@
class CSSWrapShape : public RefCounted<CSSWrapShape> {
public:
enum Type {
- CSS_WRAP_SHAPE_RECT = 1,
+ CSS_WRAP_SHAPE_RECTANGLE = 1,
CSS_WRAP_SHAPE_CIRCLE = 2,
CSS_WRAP_SHAPE_ELLIPSE = 3,
CSS_WRAP_SHAPE_POLYGON = 4,
@@ -58,9 +58,9 @@
CSSWrapShape() { }
};
-class CSSWrapShapeRect : public CSSWrapShape {
+class CSSWrapShapeRectangle : public CSSWrapShape {
public:
- static PassRefPtr<CSSWrapShapeRect> create() { return adoptRef(new CSSWrapShapeRect); }
+ static PassRefPtr<CSSWrapShapeRectangle> create() { return adoptRef(new CSSWrapShapeRectangle); }
CSSPrimitiveValue* left() const { return m_left.get(); }
CSSPrimitiveValue* top() const { return m_top.get(); }
@@ -76,11 +76,11 @@
void setRadiusX(PassRefPtr<CSSPrimitiveValue> radiusX) { m_radiusX = radiusX; }
void setRadiusY(PassRefPtr<CSSPrimitiveValue> radiusY) { m_radiusY = radiusY; }
- virtual Type type() { return CSS_WRAP_SHAPE_RECT; }
+ virtual Type type() { return CSS_WRAP_SHAPE_RECTANGLE; }
virtual String cssText() const;
private:
- CSSWrapShapeRect() { }
+ CSSWrapShapeRectangle() { }
RefPtr<CSSPrimitiveValue> m_top;
RefPtr<CSSPrimitiveValue> m_left;
