Changeset 138833 in webkit

Timestamp:

Jan 4, 2013 12:32:35 PM (11 years ago)

Author:

mikelawther@chromium.org

Message:

CSS3 calc: working with translate and scale transforms
​https://bugs.webkit.org/show_bug.cgi?id=105985

Reviewed by Ojan Vafai.

Source/WebCore:

Allow convertTo[Float|Int]Length functions to process calculated values.

Tests: css3/calc/transforms-scale.html

css3/calc/transforms-translate.html

• css/StyleResolver.cpp:

(WebCore::StyleResolver::convertToIntLength):
(WebCore::StyleResolver::convertToFloatLength):

LayoutTests:

• css3/calc/transforms-scale-expected.html: Added.
• css3/calc/transforms-scale.html: Added.
• css3/calc/transforms-translate-expected.html: Added.
• css3/calc/transforms-translate.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/calc/transforms-scale-expected.html (added)
• LayoutTests/css3/calc/transforms-scale.html (added)
• LayoutTests/css3/calc/transforms-translate-expected.html (added)
• LayoutTests/css3/calc/transforms-translate.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/StyleResolver.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-04  Mike Lawther  <mikelawther@chromium.org>
+
+        CSS3 calc: working with translate and scale transforms
+        https://bugs.webkit.org/show_bug.cgi?id=105985
+
+        Reviewed by Ojan Vafai.
+
+        * css3/calc/transforms-scale-expected.html: Added.
+        * css3/calc/transforms-scale.html: Added.
+        * css3/calc/transforms-translate-expected.html: Added.
+        * css3/calc/transforms-translate.html: Added.
+
 2013-01-04  Elliott Sprehn  <esprehn@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-04  Mike Lawther  <mikelawther@chromium.org>
+
+        CSS3 calc: working with translate and scale transforms
+        https://bugs.webkit.org/show_bug.cgi?id=105985
+
+        Reviewed by Ojan Vafai.
+
+        Allow convertTo[Float|Int]Length functions to process calculated values.
+
+        Tests: css3/calc/transforms-scale.html
+               css3/calc/transforms-translate.html
+
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::convertToIntLength):
+        (WebCore::StyleResolver::convertToFloatLength):
+
 2013-01-04  Elliott Sprehn  <esprehn@chromium.org>
 

trunk/Source/WebCore/css/StyleResolver.cpp

@@ -2292 +2292 @@
 Length StyleResolver::convertToIntLength(CSSPrimitiveValue* primitiveValue, RenderStyle* style, RenderStyle* rootStyle, double multiplier)
 {
-    return primitiveValue ? primitiveValue->convertToLength<FixedIntegerConversion | PercentConversion | FractionConversion | ViewportPercentageConversion>(style, rootStyle, multiplier) : Length(Undefined);
+    return primitiveValue ? primitiveValue->convertToLength<FixedIntegerConversion | PercentConversion | CalculatedConversion | FractionConversion | ViewportPercentageConversion>(style, rootStyle, multiplier) : Length(Undefined);
 }
 
 Length StyleResolver::convertToFloatLength(CSSPrimitiveValue* primitiveValue, RenderStyle* style, RenderStyle* rootStyle, double multiplier)
 {
-    return primitiveValue ? primitiveValue->convertToLength<FixedFloatConversion | PercentConversion | FractionConversion | ViewportPercentageConversion>(style, rootStyle, multiplier) : Length(Undefined);
+    return primitiveValue ? primitiveValue->convertToLength<FixedFloatConversion | PercentConversion | CalculatedConversion | FractionConversion | ViewportPercentageConversion>(style, rootStyle, multiplier) : Length(Undefined);
 }