| Index: third_party/WebKit/Source/core/css/CSSValue.cpp
|
| diff --git a/third_party/WebKit/Source/core/css/CSSValue.cpp b/third_party/WebKit/Source/core/css/CSSValue.cpp
|
| index 64f9573ac69cdd92a338f9c8c2b12a5ae638620b..68b5a3f6e9b03ec89df0d1492ffb3f32dccbd640 100644
|
| --- a/third_party/WebKit/Source/core/css/CSSValue.cpp
|
| +++ b/third_party/WebKit/Source/core/css/CSSValue.cpp
|
| @@ -43,6 +43,7 @@
|
| #include "core/css/CSSGridAutoRepeatValue.h"
|
| #include "core/css/CSSGridLineNamesValue.h"
|
| #include "core/css/CSSGridTemplateAreasValue.h"
|
| +#include "core/css/CSSIdentifierValue.h"
|
| #include "core/css/CSSImageSetValue.h"
|
| #include "core/css/CSSImageValue.h"
|
| #include "core/css/CSSInheritedValue.h"
|
| @@ -62,6 +63,7 @@
|
| #include "core/css/CSSValueList.h"
|
| #include "core/css/CSSValuePair.h"
|
| #include "core/css/CSSVariableReferenceValue.h"
|
| +#include "platform/Length.h"
|
| #include "wtf/SizeAssertions.h"
|
|
|
| namespace blink {
|
| @@ -72,6 +74,28 @@ struct SameSizeAsCSSValue
|
| };
|
| ASSERT_SIZE(CSSValue, SameSizeAsCSSValue);
|
|
|
| +CSSValue* CSSValue::create(const Length& value, float zoom) {
|
| + switch (value.type()) {
|
| + case Auto:
|
| + case MinContent:
|
| + case MaxContent:
|
| + case FillAvailable:
|
| + case FitContent:
|
| + case ExtendToZoom:
|
| + return CSSIdentifierValue::create(value);
|
| + case Percent:
|
| + case Fixed:
|
| + case Calculated:
|
| + return CSSPrimitiveValue::create(value, zoom);
|
| + case DeviceWidth:
|
| + case DeviceHeight:
|
| + case MaxSizeNone:
|
| + NOTREACHED();
|
| + break;
|
| + }
|
| + return nullptr;
|
| +}
|
| +
|
| bool CSSValue::isImplicitInitialValue() const {
|
| return m_classType == InitialClass && toCSSInitialValue(this)->isImplicit();
|
| }
|
| @@ -153,6 +177,8 @@ bool CSSValue::equals(const CSSValue& other) const {
|
| return compareCSSValues<CSSPathValue>(*this, other);
|
| case PrimitiveClass:
|
| return compareCSSValues<CSSPrimitiveValue>(*this, other);
|
| + case IdentifierClass:
|
| + return compareCSSValues<CSSIdentifierValue>(*this, other);
|
| case QuadClass:
|
| return compareCSSValues<CSSQuadValue>(*this, other);
|
| case ReflectClass:
|
| @@ -245,6 +271,8 @@ String CSSValue::cssText() const {
|
| return toCSSPathValue(this)->customCSSText();
|
| case PrimitiveClass:
|
| return toCSSPrimitiveValue(this)->customCSSText();
|
| + case IdentifierClass:
|
| + return toCSSIdentifierValue(this)->customCSSText();
|
| case QuadClass:
|
| return toCSSQuadValue(this)->customCSSText();
|
| case ReflectClass:
|
| @@ -360,6 +388,9 @@ void CSSValue::finalizeGarbageCollectedObject() {
|
| case PrimitiveClass:
|
| toCSSPrimitiveValue(this)->~CSSPrimitiveValue();
|
| return;
|
| + case IdentifierClass:
|
| + toCSSIdentifierValue(this)->~CSSIdentifierValue();
|
| + return;
|
| case QuadClass:
|
| toCSSQuadValue(this)->~CSSQuadValue();
|
| return;
|
| @@ -490,6 +521,9 @@ DEFINE_TRACE(CSSValue) {
|
| case PrimitiveClass:
|
| toCSSPrimitiveValue(this)->traceAfterDispatch(visitor);
|
| return;
|
| + case IdentifierClass:
|
| + toCSSIdentifierValue(this)->traceAfterDispatch(visitor);
|
| + return;
|
| case QuadClass:
|
| toCSSQuadValue(this)->traceAfterDispatch(visitor);
|
| return;
|
|
|