[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)
commit3cb09290b9c996f5a4d91cf9f264534cdf51aab5
treea086f8098c43db0dd00379c93d79a397ef1776f5
parent1720ceaed76fb537ca17d5106e9023f38395cda6
[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: 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