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

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: Use m_unit Created 5 years, 1 month 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 a66b20b3de0db63bd86e5e0207aef31cce16a256..dcc6bd14b2331aeddf7a30a78caa19cb5f9f8d11 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();
}
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSValue.h ('k') | third_party/WebKit/Source/core/css/CSSValueKeywords.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698