Source/core/css/CSSCalculationValue.cpp - Issue 345903005: calc expressions should support time, angle and frequency values.

Unified Diff: Source/core/css/CSSCalculationValue.cpp

Issue 345903005: calc expressions should support time, angle and frequency values. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Fix build warrning. Created 6 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« LayoutTests/css3/calc/calc-with-time-angle-and-frequency-values.html ('K') | « Source/core/css/CSSCalculationValue.h ('k') | Source/core/css/CSSPrimitiveValue.h » ('j') | Source/core/css/CSSPrimitiveValue.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/css/CSSCalculationValue.cpp

diff --git a/Source/core/css/CSSCalculationValue.cpp b/Source/core/css/CSSCalculationValue.cpp

index 79de5eb33bf8ee142bfad3958a9777d28b560c61..ab1f662039eb5d63059f38b23ad11b2961d50d7d 100644

--- a/Source/core/css/CSSCalculationValue.cpp

+++ b/Source/core/css/CSSCalculationValue.cpp

@@ -70,9 +70,19 @@ static CalculationCategory unitCategory(CSSPrimitiveValue::UnitType type)

case CSSPrimitiveValue::CSS_VMIN:

case CSSPrimitiveValue::CSS_VMAX:

return CalcLength;

- // FIXME: Support angle, time and frequency units.

- // http://www.w3.org/TR/css3-values/#calc-notation

+ case CSSPrimitiveValue::CSS_DEG:

+ case CSSPrimitiveValue::CSS_GRAD:

+ case CSSPrimitiveValue::CSS_RAD:

+ case CSSPrimitiveValue::CSS_TURN:

+ return CalcAngle;

+ case CSSPrimitiveValue::CSS_MS:

+ case CSSPrimitiveValue::CSS_S:

+ return CalcTime;

+ case CSSPrimitiveValue::CSS_HZ:

+ case CSSPrimitiveValue::CSS_KHZ:

+ return CalcFrequency;

default:

+ ASSERT_NOT_REACHED();

return CalcOther;

}

@@ -96,6 +106,7 @@ static bool hasDoubleValue(CSSPrimitiveValue::UnitType type)

case CSSPrimitiveValue::CSS_DEG:

case CSSPrimitiveValue::CSS_RAD:

case CSSPrimitiveValue::CSS_GRAD:

+ case CSSPrimitiveValue::CSS_TURN:

case CSSPrimitiveValue::CSS_MS:

case CSSPrimitiveValue::CSS_S:

case CSSPrimitiveValue::CSS_HZ:

@@ -123,7 +134,6 @@ static bool hasDoubleValue(CSSPrimitiveValue::UnitType type)

case CSSPrimitiveValue::CSS_PARSER_OPERATOR:

case CSSPrimitiveValue::CSS_PARSER_HEXCOLOR:

case CSSPrimitiveValue::CSS_PARSER_IDENTIFIER:

- case CSSPrimitiveValue::CSS_TURN:

case CSSPrimitiveValue::CSS_COUNTER_NAME:

case CSSPrimitiveValue::CSS_SHAPE:

case CSSPrimitiveValue::CSS_QUAD:

@@ -232,11 +242,14 @@ public:

switch (m_category) {

case CalcLength:

return m_value->computeLength<double>(conversionData);

- case CalcPercent:

case CalcNumber:

+ case CalcPercent:

return m_value->getDoubleValue();

+ case CalcAngle:

+ case CalcFrequency:

case CalcPercentLength:

case CalcPercentNumber:

+ case CalcTime:

case CalcOther:

ASSERT_NOT_REACHED();

break;

@@ -283,12 +296,15 @@ private:

};

static const CalculationCategory addSubtractResult[CalcOther][CalcOther] = {

-// CalcNumber CalcLength CalcPercent CalcPercentNumber CalcPercentLength

-/* CalcNumber */ { CalcNumber, CalcOther, CalcPercentNumber, CalcPercentNumber, CalcOther },

-/* CalcLength */ { CalcOther, CalcLength, CalcPercentLength, CalcOther, CalcPercentLength },

-/* CalcPercent */ { CalcPercentNumber, CalcPercentLength, CalcPercent, CalcPercentNumber, CalcPercentLength },

-/* CalcPercentNumber */ { CalcPercentNumber, CalcOther, CalcPercentNumber, CalcPercentNumber, CalcOther },

-/* CalcPercentLength */ { CalcOther, CalcPercentLength, CalcPercentLength, CalcOther, CalcPercentLength },

+// CalcNumber CalcLength CalcPercent CalcPercentNumber CalcPercentLength CalcAngle CalcTime CalcFrequency

+/* CalcNumber */ { CalcNumber, CalcOther, CalcPercentNumber, CalcPercentNumber, CalcOther, CalcOther, CalcOther, CalcOther },

+/* CalcLength */ { CalcOther, CalcLength, CalcPercentLength, CalcOther, CalcPercentLength, CalcOther, CalcOther, CalcOther },

+/* CalcPercent */ { CalcPercentNumber, CalcPercentLength, CalcPercent, CalcPercentNumber, CalcPercentLength, CalcOther, CalcOther, CalcOther },

+/* CalcPercentNumber */ { CalcPercentNumber, CalcOther, CalcPercentNumber, CalcPercentNumber, CalcOther, CalcOther, CalcOther, CalcOther },

+/* CalcPercentLength */ { CalcOther, CalcPercentLength, CalcPercentLength, CalcOther, CalcPercentLength, CalcOther, CalcOther, CalcOther },

+/* CalcAngle */ { CalcOther, CalcOther, CalcOther, CalcOther, CalcOther, CalcAngle, CalcOther, CalcOther },

+/* CalcTime */ { CalcOther, CalcOther, CalcOther, CalcOther, CalcOther, CalcOther, CalcTime, CalcOther },

+/* CalcFrequency */ { CalcOther, CalcOther, CalcOther, CalcOther, CalcOther, CalcOther, CalcOther, CalcFrequency }

};

static CalculationCategory determineCategory(const CSSCalcExpressionNode& leftSide, const CSSCalcExpressionNode& rightSide, CalcOperator op)

@@ -517,6 +533,12 @@ public:

return leftType;

return CSSPrimitiveValue::CSS_UNKNOWN;

}

+ case CalcAngle:

+ return CSSPrimitiveValue::CSS_DEG;

+ case CalcTime:

+ return CSSPrimitiveValue::CSS_MS;

+ case CalcFrequency:

+ return CSSPrimitiveValue::CSS_HZ;

case CalcPercentLength:

case CalcPercentNumber:

case CalcOther:

@@ -630,11 +652,7 @@ private:

if (!value || !value->isPrimitiveValue())

return false;

- CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value.get());

- if (unitCategory(primitiveValue->primitiveType()) == CalcOther)

- return false;

- result->value = CSSCalcPrimitiveValue::create(primitiveValue, parserValue->isInt);

+ result->value = CSSCalcPrimitiveValue::create(toCSSPrimitiveValue(value.get()), parserValue->isInt);

alancutter (OOO until 2018) 2014/07/21 14:03:47 The unitCategory check could be turned into an ASS

reni 2014/07/25 08:44:43 Good point! calc(42fr) showed that we have to coun

++*index;

return true;