[CSS Exclusions] Update wrap-margin/padding to shape-margin/padding
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: http://svn.webkit.org/repository/webkit/trunk@134433 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/css/CSSProperty.cpp b/Source/WebCore/css/CSSProperty.cpp
index 1f12187..6128a10 100644
--- a/Source/WebCore/css/CSSProperty.cpp
+++ b/Source/WebCore/css/CSSProperty.cpp
@@ -652,8 +652,8 @@
#if ENABLE(CSS_EXCLUSIONS)
case CSSPropertyWebkitWrap:
case CSSPropertyWebkitWrapFlow:
- case CSSPropertyWebkitWrapMargin:
- case CSSPropertyWebkitWrapPadding:
+ case CSSPropertyWebkitShapeMargin:
+ case CSSPropertyWebkitShapePadding:
case CSSPropertyWebkitShapeInside:
case CSSPropertyWebkitShapeOutside:
case CSSPropertyWebkitWrapThrough:
