| Index: third_party/WebKit/Source/core/css/cssom/CSSCalcLength.h
|
| diff --git a/third_party/WebKit/Source/core/css/cssom/CSSCalcLength.h b/third_party/WebKit/Source/core/css/cssom/CSSCalcLength.h
|
| index 6fef39295be5ecc6af26aceec39164e7ecf91fab..7fafde2079ebf22e398b7229afe2a3f4feaa0967 100644
|
| --- a/third_party/WebKit/Source/core/css/cssom/CSSCalcLength.h
|
| +++ b/third_party/WebKit/Source/core/css/cssom/CSSCalcLength.h
|
| @@ -5,6 +5,7 @@
|
| #ifndef CSSCalcLength_h
|
| #define CSSCalcLength_h
|
|
|
| +#include "core/css/CSSCalculationValue.h"
|
| #include "core/css/cssom/CSSLengthValue.h"
|
| #include "wtf/BitVector.h"
|
|
|
| @@ -12,17 +13,21 @@ namespace blink {
|
|
|
| class CalcDictionary;
|
| class CSSSimpleLength;
|
| +class CSSValue;
|
|
|
| class CORE_EXPORT CSSCalcLength final : public CSSLengthValue {
|
| DEFINE_WRAPPERTYPEINFO();
|
| public:
|
| static CSSCalcLength* create(const CSSLengthValue*);
|
| + static CSSCalcLength* create(const CalcDictionary&);
|
| static CSSCalcLength* create(const CalcDictionary&, ExceptionState&);
|
| static CSSCalcLength* create(const CSSLengthValue* length, ExceptionState&)
|
| {
|
| return create(length);
|
| }
|
|
|
| + static CSSCalcLength* fromCSSValue(const CSSValue&);
|
| +
|
| #define GETTER_MACRO(name, type) \
|
| double name(bool& isNull) \
|
| { \
|
| @@ -56,14 +61,16 @@ public:
|
| protected:
|
| CSSLengthValue* addInternal(const CSSLengthValue* other, ExceptionState&) override;
|
| CSSLengthValue* subtractInternal(const CSSLengthValue* other, ExceptionState&) override;
|
| - CSSLengthValue* multiplyInternal(double, ExceptionState&) override;
|
| - CSSLengthValue* divideInternal(double, ExceptionState&) override;
|
| + CSSLengthValue* multiplyInternal(double) override;
|
| + CSSLengthValue* divideInternal(double) override;
|
|
|
| private:
|
| CSSCalcLength();
|
| CSSCalcLength(const CSSCalcLength& other);
|
| CSSCalcLength(const CSSSimpleLength& other);
|
|
|
| + static CSSCalcLength* populateCalcLengthFromExpressionNode(const CSSCalcExpressionNode*);
|
| +
|
| static int indexForUnit(CSSPrimitiveValue::UnitType);
|
| static CSSPrimitiveValue::UnitType unitFromIndex(int index)
|
| {
|
|
|