Rename CSS Exclusions "rect" value to "rectangle"

https://bugs.webkit.org/show_bug.cgi?id=82367

Patch by Hans Muller <hmuller@adobe.com> on 2012-04-05
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.

Source/WebCore:

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):

LayoutTests:

* 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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@113328 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ba6050a3acef623b53b00e3c0689b44a81182715..78bcae33c255543de911027294a653c357594206 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2012-04-05  Hans Muller  <hmuller@adobe.com>
+
+        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  <dglazkov@chromium.org>
 
         [Chromium] Marked fast/filesystem/file-writer-abort-continue.html as flaky crash

diff --git a/LayoutTests/fast/exclusions/parsing-wrap-shape-inside-expected.txt b/LayoutTests/fast/exclusions/parsing-wrap-shape-inside-expected.txt
index cde7707bf80827d1f8ffc45d67cab6293a2b5f6f..720a2a478f6217fc2347351258447dba32d9405c 100644 (file)
--- a/LayoutTests/fast/exclusions/parsing-wrap-shape-inside-expected.txt
+++ b/LayoutTests/fast/exclusions/parsing-wrap-shape-inside-expected.txt
@@ -5,12 +5,12 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 
 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 testCSSText("polygon(evenodd, 10px, 20px 30px, 40px 40px, 50px)") is "polyg
 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 ""

diff --git a/LayoutTests/fast/exclusions/parsing-wrap-shape-outside-expected.txt b/LayoutTests/fast/exclusions/parsing-wrap-shape-outside-expected.txt
index 3e66dd1c5f9b3494dede76335fa222fc7a532bde..76f51b7f95681fd8c1ee14a90e66e0f091cf5dc2 100644 (file)
--- a/LayoutTests/fast/exclusions/parsing-wrap-shape-outside-expected.txt
+++ b/LayoutTests/fast/exclusions/parsing-wrap-shape-outside-expected.txt
@@ -5,12 +5,12 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 
 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 testCSSText("polygon(evenodd, 10px, 20px 30px, 40px 40px, 50px)") is "polyg
 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 ""

diff --git a/LayoutTests/fast/exclusions/script-tests/parsing-wrap-shape-inside.js b/LayoutTests/fast/exclusions/script-tests/parsing-wrap-shape-inside.js
index d962a726a9a56341f9af38e7340ef180105bef3d..2e771f60185f0318f682740e8fe7eaa4a5258017 100644 (file)
--- a/LayoutTests/fast/exclusions/script-tests/parsing-wrap-shape-inside.js
+++ b/LayoutTests/fast/exclusions/script-tests/parsing-wrap-shape-inside.js
@@ -55,9 +55,9 @@ function negative_test(value) {
 // 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(10px, 20px 30px, 40px 40px, 50px)", "polygon(nonzero, 10px, 20px 3
 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 @@ shouldBeEqualToString('testNotInherited("auto", "inherit")', "parent: auto, chil
 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)");

diff --git a/LayoutTests/fast/exclusions/script-tests/parsing-wrap-shape-outside.js b/LayoutTests/fast/exclusions/script-tests/parsing-wrap-shape-outside.js
index baf3238d6d039bd8e7668dd0e18fa6215c0fb48c..70a2812eb39bd9368aa775da8b10d6d70524e36d 100644 (file)
--- a/LayoutTests/fast/exclusions/script-tests/parsing-wrap-shape-outside.js
+++ b/LayoutTests/fast/exclusions/script-tests/parsing-wrap-shape-outside.js
@@ -55,9 +55,9 @@ function negative_test(value) {
 // 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(10px, 20px 30px, 40px 40px, 50px)", "polygon(nonzero, 10px, 20px 3
 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 @@ shouldBeEqualToString('testNotInherited("auto", "inherit")', "parent: auto, chil
 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)");

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index da28dc52f1f7fcf533c9d1ffcc3a23cbb3ee7303..f0125eee8ddf27c0443225ce7f9915baa99bc5f8 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,29 @@
+2012-04-05  Hans Muller  <hmuller@adobe.com>
+
+        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  <anilsson@rim.com>
 
         [BlackBerry] Disable paintingGoesToWindow() for the root layer when forced compositing mode is active

diff --git a/Source/WebCore/css/CSSParser.cpp b/Source/WebCore/css/CSSParser.cpp
index f6e18ad8bcf0f48a20a56e0677f7f005fca2a61d..405b0558103bc3341dc8ffab98fd4e0cac97e419 100644 (file)
--- a/Source/WebCore/css/CSSParser.cpp
+++ b/Source/WebCore/css/CSSParser.cpp
@@ -4092,7 +4092,7 @@ bool CSSParser::parseClipShape(CSSPropertyID propId, bool important)
     return false;
 }
 
-PassRefPtr<CSSWrapShape> CSSParser::parseExclusionShapeRect(CSSParserValueList* args)
+PassRefPtr<CSSWrapShape> CSSParser::parseExclusionShapeRectangle(CSSParserValueList* args)
 {
     ASSERT(args);
 
@@ -4100,7 +4100,7 @@ PassRefPtr<CSSWrapShape> CSSParser::parseExclusionShapeRect(CSSParserValueList*
     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 @@ bool CSSParser::parseExclusionShape(bool shapeInside, bool important)
 
     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("))

diff --git a/Source/WebCore/css/CSSParser.h b/Source/WebCore/css/CSSParser.h
index acdb2df35f1586a5e4e408f375cb298f9fb0db18..867e2c7251f67d5a346b21867b431a2cb710f6f5 100644 (file)
--- a/Source/WebCore/css/CSSParser.h
+++ b/Source/WebCore/css/CSSParser.h
@@ -143,7 +143,7 @@ public:
     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);

diff --git a/Source/WebCore/css/CSSWrapShapes.cpp b/Source/WebCore/css/CSSWrapShapes.cpp
index fff84b95d2bb08304b8fdfce19433b3eec807408..06def3563e76cdffe322708386ed9b277aa221d7 100644 (file)
--- a/Source/WebCore/css/CSSWrapShapes.cpp
+++ b/Source/WebCore/css/CSSWrapShapes.cpp
@@ -37,14 +37,14 @@ using namespace WTF;
 
 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);

diff --git a/Source/WebCore/css/CSSWrapShapes.h b/Source/WebCore/css/CSSWrapShapes.h
index 38487b6dbd14cc1fcfb7e75674d3d0931d5f8bce..ca37289e5a1da196855413acf8a5ac9d5ebf2bd4 100644 (file)
--- a/Source/WebCore/css/CSSWrapShapes.h
+++ b/Source/WebCore/css/CSSWrapShapes.h
@@ -41,7 +41,7 @@ namespace WebCore {
 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 @@ protected:
     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 @@ public:
     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;