[CSS Exclusions] Update wrap-margin/padding to shape-margin/padding
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 13 Nov 2012 17:53:31 +0000 (17:53 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 13 Nov 2012 17:53:31 +0000 (17:53 +0000)
https://bugs.webkit.org/show_bug.cgi?id=97736

Patch by Bem Jones-Bey <bjonesbe@adobe.com> on 2012-11-13
Reviewed by Andreas Kling.

Rename properties to match updated spec.

Source/WebCore:

Tests: fast/exclusions/shape-margin-parsing.html
       fast/exclusions/shape-padding-parsing.html

* css/CSSComputedStyleDeclaration.cpp:
(WebCore):
(WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
* css/CSSParser.cpp:
(WebCore::isSimpleLengthPropertyID):
(WebCore::CSSParser::parseValue):
* css/CSSProperty.cpp:
(WebCore::CSSProperty::isInheritedProperty):
* css/CSSPropertyNames.in:
* css/StyleBuilder.cpp:
(WebCore::StyleBuilder::StyleBuilder):
* css/StylePropertySet.cpp:
(WebCore::StylePropertySet::asText):
* css/StylePropertyShorthand.cpp:
(WebCore::webkitWrapShorthand):
* css/StyleResolver.cpp:
(WebCore::StyleResolver::applyProperty):
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::diff):
* rendering/style/RenderStyle.h:
* rendering/style/StyleRareNonInheritedData.cpp:
(WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
(WebCore::StyleRareNonInheritedData::operator==):
* rendering/style/StyleRareNonInheritedData.h:
(StyleRareNonInheritedData):

LayoutTests:

* fast/exclusions/css-exclusions-disabled-expected.txt:
* fast/exclusions/css-exclusions-disabled.html:
* fast/exclusions/script-tests/shape-margin-parsing.js: Added.
(test):
(testComputedStyle):
(testNotInherited):
* fast/exclusions/script-tests/shape-padding-parsing.js: Added.
(test):
(testComputedStyle):
(testNotInherited):
* fast/exclusions/script-tests/wrap-margin-parsing.js: Removed.
* fast/exclusions/script-tests/wrap-padding-parsing.js: Removed.
* fast/exclusions/script-tests/wrap-parsing.js:
(testComputedStyle):
* fast/exclusions/shape-margin-parsing-expected.txt: Added.
* fast/exclusions/shape-margin-parsing.html: Renamed from LayoutTests/fast/exclusions/wrap-padding-parsing.html.
* fast/exclusions/shape-padding-parsing-expected.txt: Added.
* fast/exclusions/shape-padding-parsing.html: Renamed from LayoutTests/fast/exclusions/wrap-margin-parsing.html.
* fast/exclusions/wrap-margin-parsing-expected.txt: Removed.
* fast/exclusions/wrap-padding-parsing-expected.txt: Removed.

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

27 files changed:
LayoutTests/ChangeLog
LayoutTests/fast/exclusions/css-exclusions-disabled-expected.txt
LayoutTests/fast/exclusions/css-exclusions-disabled.html
LayoutTests/fast/exclusions/script-tests/shape-margin-parsing.js [new file with mode: 0644]
LayoutTests/fast/exclusions/script-tests/shape-padding-parsing.js [new file with mode: 0644]
LayoutTests/fast/exclusions/script-tests/wrap-margin-parsing.js [deleted file]
LayoutTests/fast/exclusions/script-tests/wrap-padding-parsing.js [deleted file]
LayoutTests/fast/exclusions/script-tests/wrap-parsing.js
LayoutTests/fast/exclusions/shape-margin-parsing-expected.txt [new file with mode: 0644]
LayoutTests/fast/exclusions/shape-margin-parsing.html [moved from LayoutTests/fast/exclusions/wrap-padding-parsing.html with 78% similarity]
LayoutTests/fast/exclusions/shape-padding-parsing-expected.txt [new file with mode: 0644]
LayoutTests/fast/exclusions/shape-padding-parsing.html [moved from LayoutTests/fast/exclusions/wrap-margin-parsing.html with 77% similarity]
LayoutTests/fast/exclusions/wrap-margin-parsing-expected.txt [deleted file]
LayoutTests/fast/exclusions/wrap-padding-parsing-expected.txt [deleted file]
Source/WebCore/ChangeLog
Source/WebCore/css/CSSComputedStyleDeclaration.cpp
Source/WebCore/css/CSSParser.cpp
Source/WebCore/css/CSSProperty.cpp
Source/WebCore/css/CSSPropertyNames.in
Source/WebCore/css/StyleBuilder.cpp
Source/WebCore/css/StylePropertySet.cpp
Source/WebCore/css/StylePropertyShorthand.cpp
Source/WebCore/css/StyleResolver.cpp
Source/WebCore/rendering/style/RenderStyle.cpp
Source/WebCore/rendering/style/RenderStyle.h
Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp
Source/WebCore/rendering/style/StyleRareNonInheritedData.h

index a3f1cf58ce288b7be33a76e4388f0d804c0dbd62..79d8d04f3eacf8d66edbd8990ecdfb873d4546d5 100644 (file)
@@ -1,3 +1,33 @@
+2012-11-13  Bem Jones-Bey  <bjonesbe@adobe.com>
+
+        [CSS Exclusions] Update wrap-margin/padding to shape-margin/padding
+        https://bugs.webkit.org/show_bug.cgi?id=97736
+
+        Reviewed by Andreas Kling.
+
+        Rename properties to match updated spec.
+
+        * fast/exclusions/css-exclusions-disabled-expected.txt:
+        * fast/exclusions/css-exclusions-disabled.html:
+        * fast/exclusions/script-tests/shape-margin-parsing.js: Added.
+        (test):
+        (testComputedStyle):
+        (testNotInherited):
+        * fast/exclusions/script-tests/shape-padding-parsing.js: Added.
+        (test):
+        (testComputedStyle):
+        (testNotInherited):
+        * fast/exclusions/script-tests/wrap-margin-parsing.js: Removed.
+        * fast/exclusions/script-tests/wrap-padding-parsing.js: Removed.
+        * fast/exclusions/script-tests/wrap-parsing.js:
+        (testComputedStyle):
+        * fast/exclusions/shape-margin-parsing-expected.txt: Added.
+        * fast/exclusions/shape-margin-parsing.html: Renamed from LayoutTests/fast/exclusions/wrap-padding-parsing.html.
+        * fast/exclusions/shape-padding-parsing-expected.txt: Added.
+        * fast/exclusions/shape-padding-parsing.html: Renamed from LayoutTests/fast/exclusions/wrap-margin-parsing.html.
+        * fast/exclusions/wrap-margin-parsing-expected.txt: Removed.
+        * fast/exclusions/wrap-padding-parsing-expected.txt: Removed.
+
 2012-11-13  Dimitri Glazkov  <dglazkov@chromium.org>
 
         Unreviewed, rolling out r134418.
index 0f53365ff9ce5139c17581bca64aba3320d98504..291beeabb933c162177e8522a8fd1620ad0c52f0 100644 (file)
@@ -5,10 +5,10 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 
 PASS testInlineStyle("-webkit-wrap-flow", "both") is null
 PASS testComputedStyle("-webkit-wrap-flow", "both") is "auto"
-PASS testInlineStyle("-webkit-wrap-margin", "10px") is null
-PASS testComputedStyle("-webkit-wrap-margin", "10px") is "0px"
-PASS testInlineStyle("-webkit-wrap-padding", "10px") is null
-PASS testComputedStyle("-webkit-wrap-padding", "10px") is "0px"
+PASS testInlineStyle("-webkit-shape-margin", "10px") is null
+PASS testComputedStyle("-webkit-shape-margin", "10px") is "0px"
+PASS testInlineStyle("-webkit-shape-padding", "10px") is null
+PASS testComputedStyle("-webkit-shape-padding", "10px") is "0px"
 PASS testInlineStyle("-webkit-wrap-through", "none") is null
 PASS testComputedStyle("-webkit-wrap-through", "none") is "wrap"
 PASS testInlineStyle("-webkit-shape-outside", "circle(10px, 10px, 10px)") is null
index e53f3799739db9bb4812a77effb0d530d82fb24a..b05d6db5f44c8f436433abaf453bf8f74ac2622f 100644 (file)
@@ -31,8 +31,8 @@ function testStyle(property, value, computedExpected) {
 
 testStyle("-webkit-wrap-flow", "both", "auto");
 
-testStyle("-webkit-wrap-margin", "10px", "0px");
-testStyle("-webkit-wrap-padding", "10px", "0px");
+testStyle("-webkit-shape-margin", "10px", "0px");
+testStyle("-webkit-shape-padding", "10px", "0px");
 
 testStyle("-webkit-wrap-through", "none", "wrap");
 
diff --git a/LayoutTests/fast/exclusions/script-tests/shape-margin-parsing.js b/LayoutTests/fast/exclusions/script-tests/shape-margin-parsing.js
new file mode 100644 (file)
index 0000000..f0fdcd9
--- /dev/null
@@ -0,0 +1,62 @@
+description('Test parsing of the CSS shape-margin property.');
+
+if (window.internals)
+    window.internals.settings.setCSSExclusionsEnabled(true);
+
+function test(declaration) {
+    var div = document.createElement("div");
+    div.setAttribute("style", declaration);
+    return div.style.webkitShapeMargin;
+}
+
+function testComputedStyle(value) {
+    var div = document.createElement("div");
+    document.body.appendChild(div);
+    div.style.setProperty("-webkit-shape-margin", value);
+    var webkitShapeMarginComputedValue = getComputedStyle(div).getPropertyValue("-webkit-shape-margin");
+    document.body.removeChild(div);
+    return webkitShapeMarginComputedValue;
+}
+
+function testNotInherited(parentValue, childValue) {
+    var parentDiv = document.createElement("div");
+    document.body.appendChild(parentDiv);
+    parentDiv.style.setProperty("-webkit-shape-margin", parentValue);
+
+    var childDiv = document.createElement("div");
+    parentDiv.appendChild(childDiv);
+    childDiv.style.setProperty("-webkit-shape-margin", childValue);
+
+    var childWebKitShapeMarginComputedValue = getComputedStyle(childDiv).getPropertyValue("-webkit-shape-margin");
+
+    parentDiv.removeChild(childDiv);
+    document.body.removeChild(parentDiv);
+
+    return childWebKitShapeMarginComputedValue;
+}
+
+shouldBeEqualToString('test("-webkit-shape-margin: 0")', "0px");
+shouldBeEqualToString('test("-webkit-shape-margin: 1.5ex")', "1.5ex");
+shouldBeEqualToString('test("-webkit-shape-margin: 2em")', "2em");
+shouldBeEqualToString('test("-webkit-shape-margin: 2.5in")', "2.5in");
+shouldBeEqualToString('test("-webkit-shape-margin: 3cm")', "3cm");
+shouldBeEqualToString('test("-webkit-shape-margin: 3.5mm")', "3.5mm");
+shouldBeEqualToString('test("-webkit-shape-margin: 4pt")', "4pt");
+shouldBeEqualToString('test("-webkit-shape-margin: 4.5pc")', "4.5pc");
+shouldBeEqualToString('test("-webkit-shape-margin: 5px")', "5px");
+
+shouldBeEqualToString('test("-webkit-shape-margin: -5px")', "");
+shouldBeEqualToString('test("-webkit-shape-margin: auto")', "");
+shouldBeEqualToString('test("-webkit-shape-margin: \'string\'")', "");
+shouldBeEqualToString('test("-webkit-shape-margin: 120%")', "");
+
+shouldBeEqualToString('testComputedStyle("0")', "0px");
+shouldBeEqualToString('testComputedStyle("1px")', "1px");
+shouldBeEqualToString('testComputedStyle("-5em")', "0px");
+shouldBeEqualToString('testComputedStyle("identifier")', "0px");
+shouldBeEqualToString('testComputedStyle("\'string\'")', "0px");
+
+shouldBeEqualToString('testNotInherited("0", "0")', "0px");
+shouldBeEqualToString('testNotInherited("0", "1px")', "1px");
+shouldBeEqualToString('testNotInherited("1px", "-1em")', "0px");
+shouldBeEqualToString('testNotInherited("2px", "1px")', "1px");
diff --git a/LayoutTests/fast/exclusions/script-tests/shape-padding-parsing.js b/LayoutTests/fast/exclusions/script-tests/shape-padding-parsing.js
new file mode 100644 (file)
index 0000000..7bd239f
--- /dev/null
@@ -0,0 +1,62 @@
+description('Test parsing of the CSS shape-padding property.');
+
+if (window.internals)
+    window.internals.settings.setCSSExclusionsEnabled(true);
+
+function test(declaration) {
+    var div = document.createElement("div");
+    div.setAttribute("style", declaration);
+    return div.style.webkitShapePadding;
+}
+
+function testComputedStyle(value) {
+    var div = document.createElement("div");
+    document.body.appendChild(div);
+    div.style.setProperty("-webkit-shape-padding", value);
+    var webkitShapePaddingComputedValue = getComputedStyle(div).getPropertyValue("-webkit-shape-padding");
+    document.body.removeChild(div);
+    return webkitShapePaddingComputedValue;
+}
+
+function testNotInherited(parentValue, childValue) {
+    var parentDiv = document.createElement("div");
+    document.body.appendChild(parentDiv);
+    parentDiv.style.setProperty("-webkit-shape-padding", parentValue);
+
+    var childDiv = document.createElement("div");
+    parentDiv.appendChild(childDiv);
+    childDiv.style.setProperty("-webkit-shape-padding", childValue);
+
+    var childWebKitShapePaddingComputedValue = getComputedStyle(childDiv).getPropertyValue("-webkit-shape-padding");
+
+    parentDiv.removeChild(childDiv);
+    document.body.removeChild(parentDiv);
+
+    return childWebKitShapePaddingComputedValue;
+}
+
+shouldBeEqualToString('test("-webkit-shape-padding: 0")', "0px");
+shouldBeEqualToString('test("-webkit-shape-padding: 1.5ex")', "1.5ex");
+shouldBeEqualToString('test("-webkit-shape-padding: 2em")', "2em");
+shouldBeEqualToString('test("-webkit-shape-padding: 2.5in")', "2.5in");
+shouldBeEqualToString('test("-webkit-shape-padding: 3cm")', "3cm");
+shouldBeEqualToString('test("-webkit-shape-padding: 3.5mm")', "3.5mm");
+shouldBeEqualToString('test("-webkit-shape-padding: 4pt")', "4pt");
+shouldBeEqualToString('test("-webkit-shape-padding: 4.5pc")', "4.5pc");
+shouldBeEqualToString('test("-webkit-shape-padding: 5px")', "5px");
+
+shouldBeEqualToString('test("-webkit-shape-padding: -5px")', "");
+shouldBeEqualToString('test("-webkit-shape-padding: auto")', "");
+shouldBeEqualToString('test("-webkit-shape-padding: \'string\'")', "");
+shouldBeEqualToString('test("-webkit-shape-padding: 120%")', "");
+
+shouldBeEqualToString('testComputedStyle("0")', "0px");
+shouldBeEqualToString('testComputedStyle("1px")', "1px");
+shouldBeEqualToString('testComputedStyle("-5em")', "0px");
+shouldBeEqualToString('testComputedStyle("identifier")', "0px");
+shouldBeEqualToString('testComputedStyle("\'string\'")', "0px");
+
+shouldBeEqualToString('testNotInherited("0", "0")', "0px");
+shouldBeEqualToString('testNotInherited("0", "1px")', "1px");
+shouldBeEqualToString('testNotInherited("1px", "-1em")', "0px");
+shouldBeEqualToString('testNotInherited("2px", "1px")', "1px");
diff --git a/LayoutTests/fast/exclusions/script-tests/wrap-margin-parsing.js b/LayoutTests/fast/exclusions/script-tests/wrap-margin-parsing.js
deleted file mode 100644 (file)
index f16498f..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-description('Test parsing of the CSS wrap-margin property.');
-
-if (window.internals)
-    window.internals.settings.setCSSExclusionsEnabled(true);
-
-function test(declaration) {
-    var div = document.createElement("div");
-    div.setAttribute("style", declaration);
-    return div.style.webkitWrapMargin;
-}
-
-function testComputedStyle(value) {
-    var div = document.createElement("div");
-    document.body.appendChild(div);
-    div.style.setProperty("-webkit-wrap-margin", value);
-    var webkitWrapMarginComputedValue = getComputedStyle(div).getPropertyValue("-webkit-wrap-margin");
-    document.body.removeChild(div);
-    return webkitWrapMarginComputedValue;
-}
-
-function testNotInherited(parentValue, childValue) {
-    var parentDiv = document.createElement("div");
-    document.body.appendChild(parentDiv);
-    parentDiv.style.setProperty("-webkit-wrap-margin", parentValue);
-
-    var childDiv = document.createElement("div");
-    parentDiv.appendChild(childDiv);
-    childDiv.style.setProperty("-webkit-wrap-margin", childValue);
-
-    var childWebKitWrapMarginComputedValue = getComputedStyle(childDiv).getPropertyValue("-webkit-wrap-margin");
-
-    parentDiv.removeChild(childDiv);
-    document.body.removeChild(parentDiv);
-
-    return childWebKitWrapMarginComputedValue;
-}
-
-shouldBeEqualToString('test("-webkit-wrap-margin: 0")', "0px");
-shouldBeEqualToString('test("-webkit-wrap-margin: 1.5ex")', "1.5ex");
-shouldBeEqualToString('test("-webkit-wrap-margin: 2em")', "2em");
-shouldBeEqualToString('test("-webkit-wrap-margin: 2.5in")', "2.5in");
-shouldBeEqualToString('test("-webkit-wrap-margin: 3cm")', "3cm");
-shouldBeEqualToString('test("-webkit-wrap-margin: 3.5mm")', "3.5mm");
-shouldBeEqualToString('test("-webkit-wrap-margin: 4pt")', "4pt");
-shouldBeEqualToString('test("-webkit-wrap-margin: 4.5pc")', "4.5pc");
-shouldBeEqualToString('test("-webkit-wrap-margin: 5px")', "5px");
-
-shouldBeEqualToString('test("-webkit-wrap-margin: -5px")', "");
-shouldBeEqualToString('test("-webkit-wrap-margin: auto")', "");
-shouldBeEqualToString('test("-webkit-wrap-margin: \'string\'")', "");
-shouldBeEqualToString('test("-webkit-wrap-margin: 120%")', "");
-
-shouldBeEqualToString('testComputedStyle("0")', "0px");
-shouldBeEqualToString('testComputedStyle("1px")', "1px");
-shouldBeEqualToString('testComputedStyle("-5em")', "0px");
-shouldBeEqualToString('testComputedStyle("identifier")', "0px");
-shouldBeEqualToString('testComputedStyle("\'string\'")', "0px");
-
-shouldBeEqualToString('testNotInherited("0", "0")', "0px");
-shouldBeEqualToString('testNotInherited("0", "1px")', "1px");
-shouldBeEqualToString('testNotInherited("1px", "-1em")', "0px");
-shouldBeEqualToString('testNotInherited("2px", "1px")', "1px");
diff --git a/LayoutTests/fast/exclusions/script-tests/wrap-padding-parsing.js b/LayoutTests/fast/exclusions/script-tests/wrap-padding-parsing.js
deleted file mode 100644 (file)
index 37e0293..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-description('Test parsing of the CSS wrap-padding property.');
-
-if (window.internals)
-    window.internals.settings.setCSSExclusionsEnabled(true);
-
-function test(declaration) {
-    var div = document.createElement("div");
-    div.setAttribute("style", declaration);
-    return div.style.webkitWrapPadding;
-}
-
-function testComputedStyle(value) {
-    var div = document.createElement("div");
-    document.body.appendChild(div);
-    div.style.setProperty("-webkit-wrap-padding", value);
-    var webkitWrapPaddingComputedValue = getComputedStyle(div).getPropertyValue("-webkit-wrap-padding");
-    document.body.removeChild(div);
-    return webkitWrapPaddingComputedValue;
-}
-
-function testNotInherited(parentValue, childValue) {
-    var parentDiv = document.createElement("div");
-    document.body.appendChild(parentDiv);
-    parentDiv.style.setProperty("-webkit-wrap-padding", parentValue);
-
-    var childDiv = document.createElement("div");
-    parentDiv.appendChild(childDiv);
-    childDiv.style.setProperty("-webkit-wrap-padding", childValue);
-
-    var childWebKitWrapPaddingComputedValue = getComputedStyle(childDiv).getPropertyValue("-webkit-wrap-padding");
-
-    parentDiv.removeChild(childDiv);
-    document.body.removeChild(parentDiv);
-
-    return childWebKitWrapPaddingComputedValue;
-}
-
-shouldBeEqualToString('test("-webkit-wrap-padding: 0")', "0px");
-shouldBeEqualToString('test("-webkit-wrap-padding: 1.5ex")', "1.5ex");
-shouldBeEqualToString('test("-webkit-wrap-padding: 2em")', "2em");
-shouldBeEqualToString('test("-webkit-wrap-padding: 2.5in")', "2.5in");
-shouldBeEqualToString('test("-webkit-wrap-padding: 3cm")', "3cm");
-shouldBeEqualToString('test("-webkit-wrap-padding: 3.5mm")', "3.5mm");
-shouldBeEqualToString('test("-webkit-wrap-padding: 4pt")', "4pt");
-shouldBeEqualToString('test("-webkit-wrap-padding: 4.5pc")', "4.5pc");
-shouldBeEqualToString('test("-webkit-wrap-padding: 5px")', "5px");
-
-shouldBeEqualToString('test("-webkit-wrap-padding: -5px")', "");
-shouldBeEqualToString('test("-webkit-wrap-padding: auto")', "");
-shouldBeEqualToString('test("-webkit-wrap-padding: \'string\'")', "");
-shouldBeEqualToString('test("-webkit-wrap-padding: 120%")', "");
-
-shouldBeEqualToString('testComputedStyle("0")', "0px");
-shouldBeEqualToString('testComputedStyle("1px")', "1px");
-shouldBeEqualToString('testComputedStyle("-5em")', "0px");
-shouldBeEqualToString('testComputedStyle("identifier")', "0px");
-shouldBeEqualToString('testComputedStyle("\'string\'")', "0px");
-
-shouldBeEqualToString('testNotInherited("0", "0")', "0px");
-shouldBeEqualToString('testNotInherited("0", "1px")', "1px");
-shouldBeEqualToString('testNotInherited("1px", "-1em")', "0px");
-shouldBeEqualToString('testNotInherited("2px", "1px")', "1px");
index 624f36feb6089c99dad85862878ecb12f633cb42..6568253e5b0392e33c1d3dba176c320344c1ddb4 100644 (file)
@@ -14,10 +14,10 @@ function testComputedStyle(value) {
     document.body.appendChild(div);
     div.style.setProperty("-webkit-wrap", value);
     var webkitWrapFlowComputedValue = getComputedStyle(div).getPropertyValue("-webkit-wrap-flow");
-    var webkitWrapMarginComputedValue = getComputedStyle(div).getPropertyValue("-webkit-wrap-margin");
-    var webkitWrapPaddingComputedValue = getComputedStyle(div).getPropertyValue("-webkit-wrap-padding");
+    var webkitShapeMarginComputedValue = getComputedStyle(div).getPropertyValue("-webkit-shape-margin");
+    var webkitShapePaddingComputedValue = getComputedStyle(div).getPropertyValue("-webkit-shape-padding");
     document.body.removeChild(div);
-    return webkitWrapFlowComputedValue + " " + webkitWrapMarginComputedValue + " " + webkitWrapPaddingComputedValue;
+    return webkitWrapFlowComputedValue + " " + webkitShapeMarginComputedValue + " " + webkitShapePaddingComputedValue;
 }
 
 shouldBeEqualToString('test("-webkit-wrap: auto")', "auto");
diff --git a/LayoutTests/fast/exclusions/shape-margin-parsing-expected.txt b/LayoutTests/fast/exclusions/shape-margin-parsing-expected.txt
new file mode 100644 (file)
index 0000000..ed7302d
--- /dev/null
@@ -0,0 +1,31 @@
+Test parsing of the CSS shape-margin property.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS test("-webkit-shape-margin: 0") is "0px"
+PASS test("-webkit-shape-margin: 1.5ex") is "1.5ex"
+PASS test("-webkit-shape-margin: 2em") is "2em"
+PASS test("-webkit-shape-margin: 2.5in") is "2.5in"
+PASS test("-webkit-shape-margin: 3cm") is "3cm"
+PASS test("-webkit-shape-margin: 3.5mm") is "3.5mm"
+PASS test("-webkit-shape-margin: 4pt") is "4pt"
+PASS test("-webkit-shape-margin: 4.5pc") is "4.5pc"
+PASS test("-webkit-shape-margin: 5px") is "5px"
+PASS test("-webkit-shape-margin: -5px") is ""
+PASS test("-webkit-shape-margin: auto") is ""
+PASS test("-webkit-shape-margin: 'string'") is ""
+PASS test("-webkit-shape-margin: 120%") is ""
+PASS testComputedStyle("0") is "0px"
+PASS testComputedStyle("1px") is "1px"
+PASS testComputedStyle("-5em") is "0px"
+PASS testComputedStyle("identifier") is "0px"
+PASS testComputedStyle("'string'") is "0px"
+PASS testNotInherited("0", "0") is "0px"
+PASS testNotInherited("0", "1px") is "1px"
+PASS testNotInherited("1px", "-1em") is "0px"
+PASS testNotInherited("2px", "1px") is "1px"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
similarity index 78%
rename from LayoutTests/fast/exclusions/wrap-padding-parsing.html
rename to LayoutTests/fast/exclusions/shape-margin-parsing.html
index eda2d9febdcdeb85fd25378d06217fcebeb66c17..c76169586ff96bde415e2f848d67cd6af3d3da37 100644 (file)
@@ -4,7 +4,7 @@
 <script src="../../fast/js/resources/js-test-pre.js"></script>
 </head>
 <body>
-<script src="script-tests/wrap-padding-parsing.js"></script>
+<script src="script-tests/shape-margin-parsing.js"></script>
 <script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
diff --git a/LayoutTests/fast/exclusions/shape-padding-parsing-expected.txt b/LayoutTests/fast/exclusions/shape-padding-parsing-expected.txt
new file mode 100644 (file)
index 0000000..b12af3f
--- /dev/null
@@ -0,0 +1,31 @@
+Test parsing of the CSS shape-padding property.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS test("-webkit-shape-padding: 0") is "0px"
+PASS test("-webkit-shape-padding: 1.5ex") is "1.5ex"
+PASS test("-webkit-shape-padding: 2em") is "2em"
+PASS test("-webkit-shape-padding: 2.5in") is "2.5in"
+PASS test("-webkit-shape-padding: 3cm") is "3cm"
+PASS test("-webkit-shape-padding: 3.5mm") is "3.5mm"
+PASS test("-webkit-shape-padding: 4pt") is "4pt"
+PASS test("-webkit-shape-padding: 4.5pc") is "4.5pc"
+PASS test("-webkit-shape-padding: 5px") is "5px"
+PASS test("-webkit-shape-padding: -5px") is ""
+PASS test("-webkit-shape-padding: auto") is ""
+PASS test("-webkit-shape-padding: 'string'") is ""
+PASS test("-webkit-shape-padding: 120%") is ""
+PASS testComputedStyle("0") is "0px"
+PASS testComputedStyle("1px") is "1px"
+PASS testComputedStyle("-5em") is "0px"
+PASS testComputedStyle("identifier") is "0px"
+PASS testComputedStyle("'string'") is "0px"
+PASS testNotInherited("0", "0") is "0px"
+PASS testNotInherited("0", "1px") is "1px"
+PASS testNotInherited("1px", "-1em") is "0px"
+PASS testNotInherited("2px", "1px") is "1px"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
similarity index 77%
rename from LayoutTests/fast/exclusions/wrap-margin-parsing.html
rename to LayoutTests/fast/exclusions/shape-padding-parsing.html
index 97bcfb15d38775ab60c702973ef5d0b29034fa2f..db3abf61826f21f502b97f9277129fe7cfa4c8e2 100644 (file)
@@ -4,7 +4,7 @@
 <script src="../../fast/js/resources/js-test-pre.js"></script>
 </head>
 <body>
-<script src="script-tests/wrap-margin-parsing.js"></script>
+<script src="script-tests/shape-padding-parsing.js"></script>
 <script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
diff --git a/LayoutTests/fast/exclusions/wrap-margin-parsing-expected.txt b/LayoutTests/fast/exclusions/wrap-margin-parsing-expected.txt
deleted file mode 100644 (file)
index 6a5a077..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-Test parsing of the CSS wrap-margin property.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS test("-webkit-wrap-margin: 0") is "0px"
-PASS test("-webkit-wrap-margin: 1.5ex") is "1.5ex"
-PASS test("-webkit-wrap-margin: 2em") is "2em"
-PASS test("-webkit-wrap-margin: 2.5in") is "2.5in"
-PASS test("-webkit-wrap-margin: 3cm") is "3cm"
-PASS test("-webkit-wrap-margin: 3.5mm") is "3.5mm"
-PASS test("-webkit-wrap-margin: 4pt") is "4pt"
-PASS test("-webkit-wrap-margin: 4.5pc") is "4.5pc"
-PASS test("-webkit-wrap-margin: 5px") is "5px"
-PASS test("-webkit-wrap-margin: -5px") is ""
-PASS test("-webkit-wrap-margin: auto") is ""
-PASS test("-webkit-wrap-margin: 'string'") is ""
-PASS test("-webkit-wrap-margin: 120%") is ""
-PASS testComputedStyle("0") is "0px"
-PASS testComputedStyle("1px") is "1px"
-PASS testComputedStyle("-5em") is "0px"
-PASS testComputedStyle("identifier") is "0px"
-PASS testComputedStyle("'string'") is "0px"
-PASS testNotInherited("0", "0") is "0px"
-PASS testNotInherited("0", "1px") is "1px"
-PASS testNotInherited("1px", "-1em") is "0px"
-PASS testNotInherited("2px", "1px") is "1px"
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/fast/exclusions/wrap-padding-parsing-expected.txt b/LayoutTests/fast/exclusions/wrap-padding-parsing-expected.txt
deleted file mode 100644 (file)
index 257f15b..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-Test parsing of the CSS wrap-padding property.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS test("-webkit-wrap-padding: 0") is "0px"
-PASS test("-webkit-wrap-padding: 1.5ex") is "1.5ex"
-PASS test("-webkit-wrap-padding: 2em") is "2em"
-PASS test("-webkit-wrap-padding: 2.5in") is "2.5in"
-PASS test("-webkit-wrap-padding: 3cm") is "3cm"
-PASS test("-webkit-wrap-padding: 3.5mm") is "3.5mm"
-PASS test("-webkit-wrap-padding: 4pt") is "4pt"
-PASS test("-webkit-wrap-padding: 4.5pc") is "4.5pc"
-PASS test("-webkit-wrap-padding: 5px") is "5px"
-PASS test("-webkit-wrap-padding: -5px") is ""
-PASS test("-webkit-wrap-padding: auto") is ""
-PASS test("-webkit-wrap-padding: 'string'") is ""
-PASS test("-webkit-wrap-padding: 120%") is ""
-PASS testComputedStyle("0") is "0px"
-PASS testComputedStyle("1px") is "1px"
-PASS testComputedStyle("-5em") is "0px"
-PASS testComputedStyle("identifier") is "0px"
-PASS testComputedStyle("'string'") is "0px"
-PASS testNotInherited("0", "0") is "0px"
-PASS testNotInherited("0", "1px") is "1px"
-PASS testNotInherited("1px", "-1em") is "0px"
-PASS testNotInherited("2px", "1px") is "1px"
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
index 108553021812faeee7756254bce461a53fb3de3e..47e766ee9b5e82d18c6fdfe2184932aa1c441135 100644 (file)
@@ -1,3 +1,41 @@
+2012-11-13  Bem Jones-Bey  <bjonesbe@adobe.com>
+
+        [CSS Exclusions] Update wrap-margin/padding to shape-margin/padding
+        https://bugs.webkit.org/show_bug.cgi?id=97736
+
+        Reviewed by Andreas Kling.
+
+        Rename properties to match updated spec.
+
+        Tests: fast/exclusions/shape-margin-parsing.html
+               fast/exclusions/shape-padding-parsing.html
+
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore):
+        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
+        * css/CSSParser.cpp:
+        (WebCore::isSimpleLengthPropertyID):
+        (WebCore::CSSParser::parseValue):
+        * css/CSSProperty.cpp:
+        (WebCore::CSSProperty::isInheritedProperty):
+        * css/CSSPropertyNames.in:
+        * css/StyleBuilder.cpp:
+        (WebCore::StyleBuilder::StyleBuilder):
+        * css/StylePropertySet.cpp:
+        (WebCore::StylePropertySet::asText):
+        * css/StylePropertyShorthand.cpp:
+        (WebCore::webkitWrapShorthand):
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::applyProperty):
+        * rendering/style/RenderStyle.cpp:
+        (WebCore::RenderStyle::diff):
+        * rendering/style/RenderStyle.h:
+        * rendering/style/StyleRareNonInheritedData.cpp:
+        (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
+        (WebCore::StyleRareNonInheritedData::operator==):
+        * rendering/style/StyleRareNonInheritedData.h:
+        (StyleRareNonInheritedData):
+
 2012-11-13  Dimitri Glazkov  <dglazkov@chromium.org>
 
         Unreviewed, rolling out r134418.
index f575d6c91156090da8fa16a08a40c40a070c0518..afb00d132b64b1f3303be008af3b50ea12d57cee 100644 (file)
@@ -356,8 +356,8 @@ static const CSSPropertyID computedProperties[] = {
 #endif
 #if ENABLE(CSS_EXCLUSIONS)
     CSSPropertyWebkitWrapFlow,
-    CSSPropertyWebkitWrapMargin,
-    CSSPropertyWebkitWrapPadding,
+    CSSPropertyWebkitShapeMargin,
+    CSSPropertyWebkitShapePadding,
     CSSPropertyWebkitWrapThrough,
 #endif
 #if ENABLE(SVG)
@@ -2498,10 +2498,10 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropert
 #if ENABLE(CSS_EXCLUSIONS)
         case CSSPropertyWebkitWrapFlow:
             return cssValuePool().createValue(style->wrapFlow());
-        case CSSPropertyWebkitWrapMargin:
-            return cssValuePool().createValue(style->wrapMargin());
-        case CSSPropertyWebkitWrapPadding:
-            return cssValuePool().createValue(style->wrapPadding());
+        case CSSPropertyWebkitShapeMargin:
+            return cssValuePool().createValue(style->shapeMargin());
+        case CSSPropertyWebkitShapePadding:
+            return cssValuePool().createValue(style->shapePadding());
         case CSSPropertyWebkitShapeInside:
             if (!style->shapeInside())
                 return cssValuePool().createIdentifierValue(CSSValueAuto);
index 708fb6c6789984019ff04fece2ffd96256dd72ba..50eb1b79ce60523e66b3f8ab75b4539e12d23eb1 100644 (file)
@@ -505,8 +505,8 @@ static inline bool isSimpleLengthPropertyID(CSSPropertyID propertyId, bool& acce
         acceptsNegativeNumbers = false;
         return true;
 #if ENABLE(CSS_EXCLUSIONS)
-    case CSSPropertyWebkitWrapMargin:
-    case CSSPropertyWebkitWrapPadding:
+    case CSSPropertyWebkitShapeMargin:
+    case CSSPropertyWebkitShapePadding:
         acceptsNegativeNumbers = false;
         return RuntimeEnabledFeatures::cssExclusionsEnabled();
 #endif
@@ -2740,8 +2740,8 @@ bool CSSParser::parseValue(CSSPropertyID propId, bool important)
         else if (value->unit == CSSParserValue::Function)
             return parseBasicShape(propId, important);
         break;
-    case CSSPropertyWebkitWrapMargin:
-    case CSSPropertyWebkitWrapPadding:
+    case CSSPropertyWebkitShapeMargin:
+    case CSSPropertyWebkitShapePadding:
         validPrimitive = (RuntimeEnabledFeatures::cssExclusionsEnabled() && !id && validUnit(value, FLength | FNonNeg));
         break;
     case CSSPropertyWebkitWrap:
index 1f121874a8310dbad681de82987b94bb8bd0525f..6128a1097b6a63b4d3d366b7ebe3411c325da5df 100644 (file)
@@ -652,8 +652,8 @@ bool CSSProperty::isInheritedProperty(CSSPropertyID propertyID)
 #if ENABLE(CSS_EXCLUSIONS)
     case CSSPropertyWebkitWrap:
     case CSSPropertyWebkitWrapFlow:
-    case CSSPropertyWebkitWrapMargin:
-    case CSSPropertyWebkitWrapPadding:
+    case CSSPropertyWebkitShapeMargin:
+    case CSSPropertyWebkitShapePadding:
     case CSSPropertyWebkitShapeInside:
     case CSSPropertyWebkitShapeOutside:
     case CSSPropertyWebkitWrapThrough:
index 3fdbbb82acd36f0c2372fb35f2a2de27cbf61193..ca359b5213a3efee7b7aef67f2afd1b7d5e67164 100644 (file)
@@ -397,8 +397,8 @@ z-index
 #if defined(ENABLE_CSS_EXCLUSIONS) && ENABLE_CSS_EXCLUSIONS
 -webkit-shape-inside
 -webkit-shape-outside
--webkit-wrap-margin
--webkit-wrap-padding
+-webkit-shape-margin
+-webkit-shape-padding
 -webkit-wrap-flow
 -webkit-wrap-through
 -webkit-wrap
index a42a1b1fb7d13e5f2a00755d2abf3a09b09ea7a1..ed88640a48ae3749ba661a587326e0e0b3ce4d9d 100644 (file)
@@ -2067,10 +2067,10 @@ StyleBuilder::StyleBuilder()
     setPropertyHandler(CSSPropertyWebkitClipPath, ApplyPropertyClipPath<&RenderStyle::clipPath, &RenderStyle::setClipPath, &RenderStyle::initialClipPath>::createHandler());
 
 #if ENABLE(CSS_EXCLUSIONS)
-    setPropertyHandler(CSSPropertyWebkitWrap, ApplyPropertyExpanding<SuppressValue, CSSPropertyWebkitWrapFlow, CSSPropertyWebkitWrapMargin, CSSPropertyWebkitWrapPadding>::createHandler());
+    setPropertyHandler(CSSPropertyWebkitWrap, ApplyPropertyExpanding<SuppressValue, CSSPropertyWebkitWrapFlow, CSSPropertyWebkitShapeMargin, CSSPropertyWebkitShapePadding>::createHandler());
     setPropertyHandler(CSSPropertyWebkitWrapFlow, ApplyPropertyDefault<WrapFlow, &RenderStyle::wrapFlow, WrapFlow, &RenderStyle::setWrapFlow, WrapFlow, &RenderStyle::initialWrapFlow>::createHandler());
-    setPropertyHandler(CSSPropertyWebkitWrapMargin, ApplyPropertyLength<&RenderStyle::wrapMargin, &RenderStyle::setWrapMargin, &RenderStyle::initialWrapMargin>::createHandler());
-    setPropertyHandler(CSSPropertyWebkitWrapPadding, ApplyPropertyLength<&RenderStyle::wrapPadding, &RenderStyle::setWrapPadding, &RenderStyle::initialWrapPadding>::createHandler());
+    setPropertyHandler(CSSPropertyWebkitShapeMargin, ApplyPropertyLength<&RenderStyle::shapeMargin, &RenderStyle::setShapeMargin, &RenderStyle::initialShapeMargin>::createHandler());
+    setPropertyHandler(CSSPropertyWebkitShapePadding, ApplyPropertyLength<&RenderStyle::shapePadding, &RenderStyle::setShapePadding, &RenderStyle::initialShapePadding>::createHandler());
     setPropertyHandler(CSSPropertyWebkitWrapThrough, ApplyPropertyDefault<WrapThrough, &RenderStyle::wrapThrough, WrapThrough, &RenderStyle::setWrapThrough, WrapThrough, &RenderStyle::initialWrapThrough>::createHandler());
     setPropertyHandler(CSSPropertyWebkitShapeInside, ApplyPropertyExclusionShape<&RenderStyle::shapeInside, &RenderStyle::setShapeInside, &RenderStyle::initialShapeInside>::createHandler());
     setPropertyHandler(CSSPropertyWebkitShapeOutside, ApplyPropertyExclusionShape<&RenderStyle::shapeOutside, &RenderStyle::setShapeOutside, &RenderStyle::initialShapeOutside>::createHandler());
index 76dd612df16c35dbfaa666323cd669c445777dc9..81d17508f30314fa24da0c63aa195420e7b2e392 100644 (file)
@@ -813,8 +813,8 @@ String StylePropertySet::asText() const
             break;
 #if ENABLE(CSS_EXCLUSIONS)
         case CSSPropertyWebkitWrapFlow:
-        case CSSPropertyWebkitWrapMargin:
-        case CSSPropertyWebkitWrapPadding:
+        case CSSPropertyWebkitShapeMargin:
+        case CSSPropertyWebkitShapePadding:
             shorthandPropertyID = CSSPropertyWebkitWrap;
             break;
 #endif
index 3bff5abde1281bce276368ce2583d73f261349da..74a802967b73d5eef00d484ca0f6d0e8cbefc4c2 100644 (file)
@@ -441,8 +441,8 @@ const StylePropertyShorthand& webkitWrapShorthand()
 {
     static const CSSPropertyID webkitWrapProperties[] = {
         CSSPropertyWebkitWrapFlow,
-        CSSPropertyWebkitWrapMargin,
-        CSSPropertyWebkitWrapPadding
+        CSSPropertyWebkitShapeMargin,
+        CSSPropertyWebkitShapePadding
     };
     DEFINE_STATIC_LOCAL(StylePropertyShorthand, webkitWrapLonghands, (webkitWrapProperties, WTF_ARRAY_LENGTH(webkitWrapProperties)));
     return webkitWrapLonghands;
index 12c6046917fd03934bb493174dfec16fd720ef11..ceb2eb812556edcbd3a485e545dc2f640fee42be 100644 (file)
@@ -3877,8 +3877,8 @@ void StyleResolver::applyProperty(CSSPropertyID id, CSSValue* value)
 #if ENABLE(CSS_EXCLUSIONS)
     case CSSPropertyWebkitWrap:
     case CSSPropertyWebkitWrapFlow:
-    case CSSPropertyWebkitWrapMargin:
-    case CSSPropertyWebkitWrapPadding:
+    case CSSPropertyWebkitShapeMargin:
+    case CSSPropertyWebkitShapePadding:
     case CSSPropertyWebkitWrapThrough:
     case CSSPropertyWebkitShapeInside:
     case CSSPropertyWebkitShapeOutside:
index 179d32549526d74f66f8bb5fd8aac6aeac9d92a5..d7f41816ad03b8b1eb08affb9822bac8e206050b 100644 (file)
@@ -397,8 +397,8 @@ StyleDifference RenderStyle::diff(const RenderStyle* other, unsigned& changedCon
 
         if (rareNonInheritedData->m_wrapFlow != other->rareNonInheritedData->m_wrapFlow
             || rareNonInheritedData->m_wrapThrough != other->rareNonInheritedData->m_wrapThrough
-            || rareNonInheritedData->m_wrapMargin != other->rareNonInheritedData->m_wrapMargin
-            || rareNonInheritedData->m_wrapPadding != other->rareNonInheritedData->m_wrapPadding)
+            || rareNonInheritedData->m_shapeMargin != other->rareNonInheritedData->m_shapeMargin
+            || rareNonInheritedData->m_shapePadding != other->rareNonInheritedData->m_shapePadding)
             return StyleDifferenceLayout;
 
         if (rareNonInheritedData->m_deprecatedFlexibleBox.get() != other->rareNonInheritedData->m_deprecatedFlexibleBox.get()
index 65dcfd8e2dfe264cd16f528eb4452007b721d7de..1deb6f787e4d20dc475b43235decc4aeca0546c2 100644 (file)
@@ -1481,13 +1481,13 @@ public:
 
     static ClipPathOperation* initialClipPath() { return 0; }
 
-    Length wrapPadding() const { return rareNonInheritedData->m_wrapPadding; }
-    void setWrapPadding(Length wrapPadding) { SET_VAR(rareNonInheritedData, m_wrapPadding, wrapPadding); }
-    static Length initialWrapPadding() { return Length(0, Fixed); }
+    Length shapePadding() const { return rareNonInheritedData->m_shapePadding; }
+    void setShapePadding(Length shapePadding) { SET_VAR(rareNonInheritedData, m_shapePadding, shapePadding); }
+    static Length initialShapePadding() { return Length(0, Fixed); }
 
-    Length wrapMargin() const { return rareNonInheritedData->m_wrapMargin; }
-    void setWrapMargin(Length wrapMargin) { SET_VAR(rareNonInheritedData, m_wrapMargin, wrapMargin); }
-    static Length initialWrapMargin() { return Length(0, Fixed); }
+    Length shapeMargin() const { return rareNonInheritedData->m_shapeMargin; }
+    void setShapeMargin(Length shapeMargin) { SET_VAR(rareNonInheritedData, m_shapeMargin, shapeMargin); }
+    static Length initialShapeMargin() { return Length(0, Fixed); }
 
     bool hasContent() const { return contentData(); }
     const ContentData* contentData() const { return rareNonInheritedData->m_content.get(); }
index 6c898960df1f9b5a94e05471c8633ec2b0234b3c..1c6cb1879b2d95c8580a9918e3bdfa63782736c4 100644 (file)
@@ -51,8 +51,8 @@ StyleRareNonInheritedData::StyleRareNonInheritedData()
     , m_pageSize()
     , m_shapeInside(RenderStyle::initialShapeInside())
     , m_shapeOutside(RenderStyle::initialShapeOutside())
-    , m_wrapMargin(RenderStyle::initialWrapMargin())
-    , m_wrapPadding(RenderStyle::initialWrapPadding())
+    , m_shapeMargin(RenderStyle::initialShapeMargin())
+    , m_shapePadding(RenderStyle::initialShapePadding())
     , m_clipPath(RenderStyle::initialClipPath())
     , m_visitedLinkBackgroundColor(RenderStyle::initialBackgroundColor())
     , m_order(RenderStyle::initialOrder())
@@ -125,8 +125,8 @@ StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited
     , m_pageSize(o.m_pageSize)
     , m_shapeInside(o.m_shapeInside)
     , m_shapeOutside(o.m_shapeOutside)
-    , m_wrapMargin(o.m_wrapMargin)
-    , m_wrapPadding(o.m_wrapPadding)
+    , m_shapeMargin(o.m_shapeMargin)
+    , m_shapePadding(o.m_shapePadding)
     , m_clipPath(o.m_clipPath)
     , m_visitedLinkBackgroundColor(o.m_visitedLinkBackgroundColor)
     , m_visitedLinkOutlineColor(o.m_visitedLinkOutlineColor)
@@ -210,8 +210,8 @@ bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) c
         && m_pageSize == o.m_pageSize
         && m_shapeInside == o.m_shapeInside
         && m_shapeOutside == o.m_shapeOutside
-        && m_wrapMargin == o.m_wrapMargin
-        && m_wrapPadding == o.m_wrapPadding
+        && m_shapeMargin == o.m_shapeMargin
+        && m_shapePadding == o.m_shapePadding
         && m_clipPath == o.m_clipPath
         && m_visitedLinkBackgroundColor == o.m_visitedLinkBackgroundColor
         && m_visitedLinkOutlineColor == o.m_visitedLinkOutlineColor
index e3784d4afb461459e0de3866581e114f07ec7c72..4186bb19f6a936327e301184b1414423d9dce79b 100644 (file)
@@ -139,8 +139,8 @@ public:
 
     RefPtr<BasicShape> m_shapeInside;
     RefPtr<BasicShape> m_shapeOutside;
-    Length m_wrapMargin;
-    Length m_wrapPadding;
+    Length m_shapeMargin;
+    Length m_shapePadding;
 
     RefPtr<ClipPathOperation> m_clipPath;