Changeset 111205 in webkit

Timestamp:

Mar 19, 2012 11:02:37 AM (12 years ago)

Author:

mikelawther@chromium.org

Message:

CSS3 calc: make mask images work with mixed percent/absolute
​https://bugs.webkit.org/show_bug.cgi?id=81477

Reviewed by Ojan Vafai.

Source/WebCore:

Test: css3/calc/simple-composited-mask-expected.html

• css/CSSStyleSelector.cpp:

(WebCore::CSSStyleSelector::collectMatchingRulesForList):

LayoutTests:

• css3/calc/simple-composited-mask-expected.html: Renamed from LayoutTests/css3/calc/simple-composited-mask-expected-mismatch.html.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/calc/simple-composited-mask-expected.html (moved) (moved from trunk/LayoutTests/css3/calc/simple-composited-mask-expected-mismatch.html)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSStyleSelector.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-03-19  Mike Lawther  <mikelawther@chromium.org>
+
+        CSS3 calc: make mask images work with mixed percent/absolute
+        https://bugs.webkit.org/show_bug.cgi?id=81477
+
+        Reviewed by Ojan Vafai.
+
+        * css3/calc/simple-composited-mask-expected.html: Renamed from LayoutTests/css3/calc/simple-composited-mask-expected-mismatch.html.
+
 2012-03-19  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-19  Mike Lawther  <mikelawther@chromium.org>
+
+        CSS3 calc: make mask images work with mixed percent/absolute
+        https://bugs.webkit.org/show_bug.cgi?id=81477
+
+        Reviewed by Ojan Vafai.
+
+        Test: css3/calc/simple-composited-mask-expected.html
+
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::collectMatchingRulesForList):
+
 2012-03-19  Mark Pilgrim  <pilgrim@chromium.org>
 

trunk/Source/WebCore/css/CSSStyleSelector.cpp

@@ -4225 +4225 @@
     else if (first->isPercentage())
         firstLength = Length(first->getDoubleValue(), Percent);
+    else if (first->isCalculatedPercentageWithLength())
+        firstLength = Length(first->cssCalcValue()->toCalcValue(style(), m_rootElementStyle, zoomFactor));
     else
         return;
@@ -4234 +4236 @@
     else if (second->isPercentage())
         secondLength = Length(second->getDoubleValue(), Percent);
+    else if (second->isCalculatedPercentageWithLength())
+        secondLength = Length(second->cssCalcValue()->toCalcValue(style(), m_rootElementStyle, zoomFactor));
     else
         return;