Ignore:
Timestamp:
11/17/11 04:46:16 (3 years ago)
Author:
mihnea@adobe.com
Message:

CSS Exclusions: parse the wrap-margin and wrap-padding properties
https://bugs.webkit.org/show_bug.cgi?id=71900

Reviewed by Dean Jackson.

Source/WebCore:

Tests: fast/exclusions/wrap-margin-parsing.html

fast/exclusions/wrap-padding-parsing.html

  • css/CSSComputedStyleDeclaration.cpp:

(WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):

  • css/CSSParser.cpp:

(WebCore::isSimpleLengthPropertyID):
(WebCore::CSSParser::parseValue):

  • css/CSSProperty.cpp:

(WebCore::CSSProperty::isInheritedProperty):

  • css/CSSPropertyNames.in:
  • css/CSSStyleApplyProperty.cpp:

(WebCore::CSSStyleApplyProperty::CSSStyleApplyProperty):

  • css/CSSStyleSelector.cpp:

(WebCore::CSSStyleSelector::applyProperty):

  • rendering/style/RenderStyle.cpp:

(WebCore::RenderStyle::diff):

  • rendering/style/RenderStyle.h:

(WebCore::InheritedFlags::wrapPadding):
(WebCore::InheritedFlags::setWrapPadding):
(WebCore::InheritedFlags::initialWrapPadding):
(WebCore::InheritedFlags::wrapMargin):
(WebCore::InheritedFlags::setWrapMargin):
(WebCore::InheritedFlags::initialWrapMargin):

  • rendering/style/StyleRareNonInheritedData.cpp:

(WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
(WebCore::StyleRareNonInheritedData::operator==):

  • rendering/style/StyleRareNonInheritedData.h:

LayoutTests:

  • fast/css/getComputedStyle/computed-style-expected.txt:
  • fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
  • fast/exclusions/script-tests/wrap-margin-parsing.js: Added.
  • fast/exclusions/script-tests/wrap-padding-parsing.js: Added.
  • fast/exclusions/wrap-margin-parsing-expected.txt: Added.
  • fast/exclusions/wrap-margin-parsing.html: Added.
  • fast/exclusions/wrap-padding-parsing-expected.txt: Added.
  • fast/exclusions/wrap-padding-parsing.html: Added.
  • platform/chromium-win/fast/css/getComputedStyle/computed-style-expected.txt:
  • platform/chromium-win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
  • platform/chromium-win/svg/css/getComputedStyle-basic-expected.txt:
  • svg/css/getComputedStyle-basic-expected.txt:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp

    r100570 r100604  
    4545    , m_pageSize() 
    4646    , m_wrapShape(RenderStyle::initialWrapShape()) 
     47    , m_wrapMargin(RenderStyle::initialWrapMargin()) 
     48    , m_wrapPadding(RenderStyle::initialWrapPadding()) 
    4749    , m_visitedLinkBackgroundColor(RenderStyle::initialBackgroundColor()) 
    4850    , m_flowThread(RenderStyle::initialFlowThread()) 
     
    99101    , m_pageSize(o.m_pageSize) 
    100102    , m_wrapShape(o.m_wrapShape) 
     103    , m_wrapMargin(o.m_wrapMargin) 
     104    , m_wrapPadding(o.m_wrapPadding) 
    101105    , m_visitedLinkBackgroundColor(o.m_visitedLinkBackgroundColor) 
    102106    , m_visitedLinkOutlineColor(o.m_visitedLinkBackgroundColor) 
     
    183187        && (m_wrapFlow == o.m_wrapFlow) 
    184188        && (m_wrapThrough == o.m_wrapThrough) 
     189        && (m_wrapMargin == o.m_wrapMargin) 
     190        && (m_wrapPadding == o.m_wrapPadding) 
    185191        && m_visitedLinkBackgroundColor == o.m_visitedLinkBackgroundColor 
    186192        && m_visitedLinkOutlineColor == o.m_visitedLinkOutlineColor 
Note: See TracChangeset for help on using the changeset viewer.