Changeset 111200 in webkit


Ignore:
Timestamp:
Mar 19, 2012 10:34:18 AM (12 years ago)
Author:
mikelawther@chromium.org
Message:

CSS3 calc: background positioning works with mixed percent/absolute expressions
https://bugs.webkit.org/show_bug.cgi?id=81478

Reviewed by Ojan Vafai.

Source/WebCore:

Test: css3/calc/background-position-parsing-expected.html

  • css/CSSStyleSelector.cpp:

(WebCore::CSSStyleSelector::collectMatchingRulesForList):

LayoutTests:

  • css3/calc/background-position-parsing-expected.html: Renamed from LayoutTests/css3/calc/background-position-parsing-expected-mismatch.html.
Location:
trunk
Files:
3 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r111189 r111200  
     12012-03-19  Mike Lawther  <mikelawther@chromium.org>
     2
     3        CSS3 calc: background positioning works with mixed percent/absolute expressions
     4        https://bugs.webkit.org/show_bug.cgi?id=81478
     5
     6        Reviewed by Ojan Vafai.
     7
     8        * css3/calc/background-position-parsing-expected.html: Renamed from LayoutTests/css3/calc/background-position-parsing-expected-mismatch.html.
     9
    1102012-03-19  Levi Weintraub  <leviw@chromium.org>
    211
  • trunk/Source/WebCore/ChangeLog

    r111198 r111200  
     12012-03-19  Mike Lawther  <mikelawther@chromium.org>
     2
     3        CSS3 calc: background positioning works with mixed percent/absolute expressions
     4        https://bugs.webkit.org/show_bug.cgi?id=81478
     5
     6        Reviewed by Ojan Vafai.
     7
     8        Test: css3/calc/background-position-parsing-expected.html
     9
     10        * css/CSSStyleSelector.cpp:
     11        (WebCore::CSSStyleSelector::collectMatchingRulesForList):
     12
    1132012-03-19  Alexander Færøy  <alexander.faeroy@nokia.com>
    214
  • trunk/Source/WebCore/css/CSSStyleSelector.cpp

    r111009 r111200  
    42604260    else if (primitiveValue->isPercentage())
    42614261        l = Length(primitiveValue->getDoubleValue(), Percent);
     4262    else if (primitiveValue->isCalculatedPercentageWithLength())
     4263        l = Length(primitiveValue->cssCalcValue()->toCalcValue(style(), m_rootElementStyle, zoomFactor));
    42624264    else
    42634265        return;
     
    42834285    else if (primitiveValue->isPercentage())
    42844286        l = Length(primitiveValue->getDoubleValue(), Percent);
     4287    else if (primitiveValue->isCalculatedPercentageWithLength())
     4288        l = Length(primitiveValue->cssCalcValue()->toCalcValue(style(), m_rootElementStyle, zoomFactor));
    42854289    else
    42864290        return;
Note: See TracChangeset for help on using the changeset viewer.