| 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 99607fd4ee237d36ee1b1c167870df93bfe4fd4d..faf874d80ca8f0d03e0fdb1ad7decc583bcc00be 100644
|
| --- a/third_party/WebKit/Source/core/css/CSSValue.cpp
|
| +++ b/third_party/WebKit/Source/core/css/CSSValue.cpp
|
| @@ -35,6 +35,7 @@
|
| #include "core/css/CSSCrossfadeValue.h"
|
| #include "core/css/CSSCursorImageValue.h"
|
| #include "core/css/CSSCustomIdentValue.h"
|
| +#include "core/css/CSSCustomPropertyDeclaration.h"
|
| #include "core/css/CSSFontFaceSrcValue.h"
|
| #include "core/css/CSSFontFeatureValue.h"
|
| #include "core/css/CSSFunctionValue.h"
|
| @@ -58,6 +59,7 @@
|
| #include "core/css/CSSUnsetValue.h"
|
| #include "core/css/CSSValueList.h"
|
| #include "core/css/CSSValuePair.h"
|
| +#include "core/css/CSSVariableReferenceValue.h"
|
|
|
| namespace blink {
|
|
|
| @@ -170,6 +172,10 @@ bool CSSValue::equals(const CSSValue& other) const
|
| return compareCSSValues<CSSSVGDocumentValue>(*this, other);
|
| case CSSContentDistributionClass:
|
| return compareCSSValues<CSSContentDistributionValue>(*this, other);
|
| + case CustomPropertyDeclarationClass:
|
| + return compareCSSValues<CSSCustomPropertyDeclaration>(*this, other);
|
| + case VariableReferenceClass:
|
| + return compareCSSValues<CSSVariableReferenceValue>(*this, other);
|
| }
|
| ASSERT_NOT_REACHED();
|
| return false;
|
| @@ -252,6 +258,11 @@ String CSSValue::cssText() const
|
| return toCSSSVGDocumentValue(this)->customCSSText();
|
| case CSSContentDistributionClass:
|
| return toCSSContentDistributionValue(this)->customCSSText();
|
| + case VariableReferenceClass:
|
| + return toCSSVariableReferenceValue(this)->customCSSText();
|
| + case CustomPropertyDeclarationClass:
|
| + // TODO(leviw): We don't allow custom properties in CSSOM yet
|
| + ASSERT_NOT_REACHED();
|
| }
|
| ASSERT_NOT_REACHED();
|
| return String();
|
| @@ -368,6 +379,12 @@ void CSSValue::destroy()
|
| case CSSContentDistributionClass:
|
| delete toCSSContentDistributionValue(this);
|
| return;
|
| + case VariableReferenceClass:
|
| + delete toCSSVariableReferenceValue(this);
|
| + return;
|
| + case CustomPropertyDeclarationClass:
|
| + delete toCSSCustomPropertyDeclaration(this);
|
| + return;
|
| }
|
| ASSERT_NOT_REACHED();
|
| }
|
| @@ -483,6 +500,12 @@ void CSSValue::finalizeGarbageCollectedObject()
|
| case CSSContentDistributionClass:
|
| toCSSContentDistributionValue(this)->~CSSContentDistributionValue();
|
| return;
|
| + case VariableReferenceClass:
|
| + toCSSVariableReferenceValue(this)->~CSSVariableReferenceValue();
|
| + return;
|
| + case CustomPropertyDeclarationClass:
|
| + toCSSCustomPropertyDeclaration(this)->~CSSCustomPropertyDeclaration();
|
| + return;
|
| }
|
| ASSERT_NOT_REACHED();
|
| }
|
| @@ -598,6 +621,12 @@ DEFINE_TRACE(CSSValue)
|
| case CSSContentDistributionClass:
|
| toCSSContentDistributionValue(this)->traceAfterDispatch(visitor);
|
| return;
|
| + case VariableReferenceClass:
|
| + toCSSVariableReferenceValue(this)->traceAfterDispatch(visitor);
|
| + return;
|
| + case CustomPropertyDeclarationClass:
|
| + toCSSCustomPropertyDeclaration(this)->traceAfterDispatch(visitor);
|
| + return;
|
| }
|
| ASSERT_NOT_REACHED();
|
| }
|
|
|