Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(106)

Unified Diff: third_party/WebKit/Source/core/css/CSSValue.cpp

Issue 1192983003: CSS Custom Properties (Variables) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Post-merge Created 5 years, 3 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
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 7d5d4acee8a3b3d2c306128f320367acd26256ac..4a3403b3c4bcc1e9c3a5abd423b1b4e2e0cc6294 100644
--- a/third_party/WebKit/Source/core/css/CSSValue.cpp
+++ b/third_party/WebKit/Source/core/css/CSSValue.cpp
@@ -33,6 +33,7 @@
#include "core/css/CSSCounterValue.h"
#include "core/css/CSSCrossfadeValue.h"
#include "core/css/CSSCursorImageValue.h"
+#include "core/css/CSSCustomPropertyDeclaration.h"
#include "core/css/CSSFontFaceSrcValue.h"
#include "core/css/CSSFontFeatureValue.h"
#include "core/css/CSSFunctionValue.h"
@@ -152,6 +153,8 @@ bool CSSValue::equals(const CSSValue& other) const
return compareCSSValues<CSSSVGDocumentValue>(*this, other);
case CSSContentDistributionClass:
return compareCSSValues<CSSContentDistributionValue>(*this, other);
+ case VariableClass:
+ return compareCSSValues<CSSCustomPropertyDeclaration>(*this, other);
}
ASSERT_NOT_REACHED();
return false;
@@ -220,6 +223,9 @@ String CSSValue::cssText() const
return toCSSSVGDocumentValue(this)->customCSSText();
case CSSContentDistributionClass:
return toCSSContentDistributionValue(this)->customCSSText();
+ case VariableClass:
+ // TODO(leviw): We don't allow custom properties in CSSOM yet
+ ASSERT_NOT_REACHED();
}
ASSERT_NOT_REACHED();
return String();
@@ -315,6 +321,9 @@ void CSSValue::destroy()
case CSSContentDistributionClass:
delete toCSSContentDistributionValue(this);
return;
+ case VariableClass:
+ delete toCSSCustomPropertyDeclaration(this);
+ return;
}
ASSERT_NOT_REACHED();
}
@@ -409,6 +418,8 @@ void CSSValue::finalizeGarbageCollectedObject()
case CSSContentDistributionClass:
toCSSContentDistributionValue(this)->~CSSContentDistributionValue();
return;
+ case VariableClass:
+ return;
Timothy Loh 2015/09/30 02:09:27 need to destruct?
}
ASSERT_NOT_REACHED();
}
@@ -503,6 +514,8 @@ DEFINE_TRACE(CSSValue)
case CSSContentDistributionClass:
toCSSContentDistributionValue(this)->traceAfterDispatch(visitor);
return;
+ case VariableClass:
+ return;
Timothy Loh 2015/09/30 02:09:27 need to trace?
}
ASSERT_NOT_REACHED();
}

Powered by Google App Engine
This is Rietveld 408576698