Changeset 216188 in webkit

Timestamp:

May 4, 2017 8:41:13 AM (7 years ago)

Author:

hyatt@apple.com

Message:

REGRESSION(STP): rgb() with calc() containing variables doesn't work
​https://bugs.webkit.org/show_bug.cgi?id=169939

Reviewed by Zalan Bujtas.

Source/WebCore:

Added new test in fast/css/variables.

• css/CSSCalculationValue.cpp:

(WebCore::CSSCalcExpressionNodeParser::parseValue):
Treat floats in calcs as integers when we can.

LayoutTests:

• fast/css/variables/calc-float-to-int-expected.html: Added.
• fast/css/variables/calc-float-to-int.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/variables/calc-float-to-int-expected.html (added)
• LayoutTests/fast/css/variables/calc-float-to-int.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSCalculationValue.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-05-04  Dave Hyatt  <hyatt@apple.com>
+
+        REGRESSION(STP): rgb() with calc() containing variables doesn't work
+        https://bugs.webkit.org/show_bug.cgi?id=169939
+
+        Reviewed by Zalan Bujtas.
+
+        * fast/css/variables/calc-float-to-int-expected.html: Added.
+        * fast/css/variables/calc-float-to-int.html: Added.
+
 2017-05-04  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-05-04  Dave Hyatt  <hyatt@apple.com>
+
+        REGRESSION(STP): rgb() with calc() containing variables doesn't work
+        https://bugs.webkit.org/show_bug.cgi?id=169939
+
+        Reviewed by Zalan Bujtas.
+
+        Added new test in fast/css/variables.
+
+        * css/CSSCalculationValue.cpp:
+        (WebCore::CSSCalcExpressionNodeParser::parseValue):
+        Treat floats in calcs as integers when we can.
+
 2017-05-04  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebCore/css/CSSCalculationValue.cpp

@@ -599 +599 @@
             return false;
         
-        result->value = CSSCalcPrimitiveValue::create(CSSPrimitiveValue::create(token.numericValue(), type), token.numericValueType() == IntegerValueType);
+        bool isInteger = token.numericValueType() == IntegerValueType || (token.numericValueType() == NumberValueType && token.numericValue() == trunc(token.numericValue()));
+        result->value = CSSCalcPrimitiveValue::create(CSSPrimitiveValue::create(token.numericValue(), type), isInteger);
         
         return true;