| Index: Source/core/css/CSSCalculationValue.h
|
| diff --git a/Source/core/css/CSSCalculationValue.h b/Source/core/css/CSSCalculationValue.h
|
| index 225f6ae22a94baed06f9bae9104047ad3d7b3ba3..47f513026576b9fc25437afc4924872c225cee88 100644
|
| --- a/Source/core/css/CSSCalculationValue.h
|
| +++ b/Source/core/css/CSSCalculationValue.h
|
| @@ -76,7 +76,7 @@ public:
|
| virtual bool isZero() const = 0;
|
| virtual double doubleValue() const = 0;
|
| virtual double computeLengthPx(const CSSToLengthConversionData&) const = 0;
|
| - virtual void accumulateLengthArray(CSSLengthArray&, double multiplier) const = 0;
|
| + virtual void accumulateLengthArray(CSSLengthArray&, CSSLengthTypeArray&, double multiplier) const = 0;
|
| virtual void accumulatePixelsAndPercent(const CSSToLengthConversionData&, PixelsAndPercent&, float multiplier = 1) const = 0;
|
| virtual String customCSSText() const = 0;
|
| virtual bool equals(const CSSCalcExpressionNode& other) const { return m_category == other.m_category && m_isInteger == other.m_isInteger; }
|
| @@ -121,7 +121,7 @@ public:
|
| bool isNegative() const { return m_expression->doubleValue() < 0; }
|
| ValueRange permittedValueRange() { return m_nonNegative ? ValueRangeNonNegative : ValueRangeAll; }
|
| double computeLengthPx(const CSSToLengthConversionData&) const;
|
| - void accumulateLengthArray(CSSLengthArray& lengthArray, double multiplier) const { m_expression->accumulateLengthArray(lengthArray, multiplier); }
|
| + void accumulateLengthArray(CSSLengthArray& lengthArray, CSSLengthTypeArray& lengthTypeArray, double multiplier) const { m_expression->accumulateLengthArray(lengthArray, lengthTypeArray, multiplier); }
|
| CSSCalcExpressionNode* expressionNode() const { return m_expression.get(); }
|
|
|
| String customCSSText() const;
|
|
|