Right now we have two properties named margin-top-collapse and margin-after-collapse...
authorhyatt@apple.com <hyatt@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 28 Sep 2010 21:16:50 +0000 (21:16 +0000)
committerhyatt@apple.com <hyatt@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 28 Sep 2010 21:16:50 +0000 (21:16 +0000)
commit57c67f3f12df2a0e209d59d14c427b311b51467d
tree4c100543407aac77c9fbbf10dcfebea9eea4bc4a
parent1ed7492164328549584f0fe0406e4e356de54e01
Right now we have two properties named margin-top-collapse and margin-after-collapse.  They are proprietary and only used by Safari RSS.

Reviewed by Sam Weinig.

I am adding margin-before-collapse and margin-after-collapse and just aliasing the old properties to the new ones.
This way we have some names that are directionally independent.

Note that these properties aren't like other directional properties.  They are about what to do with the before side and after side of
your block's margins when collapsing with adjacent blocks.  The meaning of before/after depend on the block-flow directionality
of the containing block.

Computed style tests all changed and the remove-shorthand.html test covers manipulation of the shorthand.

WebCore:

* css/CSSComputedStyleDeclaration.cpp:
(WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
* css/CSSParser.cpp:
(WebCore::CSSParser::parseValue):
* css/CSSPropertyLonghand.cpp:
(WebCore::initShorthandMap):
* css/CSSPropertyNames.in:
* css/CSSStyleSelector.cpp:
(WebCore::CSSStyleSelector::applyProperty):
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::MarginInfo::MarginInfo):
(WebCore::RenderBlock::isSelfCollapsingBlock):
(WebCore::RenderBlock::collapseMargins):
(WebCore::RenderBlock::layoutBlockChild):
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::diff):
* rendering/style/RenderStyle.h:
(WebCore::InheritedFlags::marginBeforeCollapse):
(WebCore::InheritedFlags::marginAfterCollapse):
(WebCore::InheritedFlags::setMarginBeforeCollapse):
(WebCore::InheritedFlags::setMarginAfterCollapse):
(WebCore::InheritedFlags::initialMarginBeforeCollapse):
(WebCore::InheritedFlags::initialMarginAfterCollapse):
* rendering/style/StyleRareNonInheritedData.cpp:
(WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
(WebCore::StyleRareNonInheritedData::operator==):
* rendering/style/StyleRareNonInheritedData.h:

LayoutTests:

* fast/css/remove-shorthand-expected.txt:
* platform/mac/fast/css/getComputedStyle/computed-style-expected.txt:
* platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
* svg/css/getComputedStyle-basic-expected.txt:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@68561 268f45cc-cd09-0410-ab3c-d52691b4dbfc
16 files changed:
LayoutTests/ChangeLog
LayoutTests/fast/css/remove-shorthand-expected.txt
LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-expected.txt
LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
LayoutTests/svg/css/getComputedStyle-basic-expected.txt
WebCore/ChangeLog
WebCore/css/CSSComputedStyleDeclaration.cpp
WebCore/css/CSSParser.cpp
WebCore/css/CSSPropertyLonghand.cpp
WebCore/css/CSSPropertyNames.in
WebCore/css/CSSStyleSelector.cpp
WebCore/rendering/RenderBlock.cpp
WebCore/rendering/style/RenderStyle.cpp
WebCore/rendering/style/RenderStyle.h
WebCore/rendering/style/StyleRareNonInheritedData.cpp
WebCore/rendering/style/StyleRareNonInheritedData.h