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

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

Issue 1376573004: Split out Color from CSSPrimitiveValue (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@split_property
Patch Set: Rebase and review feedback Created 5 years, 2 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
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSValue.h ('k') | third_party/WebKit/Source/core/css/CSSValuePool.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..089fb4a6c24083e9ce79c34ef24c17586f90dac0 100644
--- a/third_party/WebKit/Source/core/css/CSSValue.cpp
+++ b/third_party/WebKit/Source/core/css/CSSValue.cpp
@@ -30,6 +30,7 @@
#include "core/css/CSSBasicShapeValues.h"
#include "core/css/CSSBorderImageSliceValue.h"
#include "core/css/CSSCanvasValue.h"
+#include "core/css/CSSColorValue.h"
#include "core/css/CSSContentDistributionValue.h"
#include "core/css/CSSCounterValue.h"
#include "core/css/CSSCrossfadeValue.h"
@@ -110,6 +111,8 @@ bool CSSValue::equals(const CSSValue& other) const
return compareCSSValues<CSSBorderImageSliceValue>(*this, other);
case CanvasClass:
return compareCSSValues<CSSCanvasValue>(*this, other);
+ case ColorClass:
+ return compareCSSValues<CSSColorValue>(*this, other);
case CounterClass:
return compareCSSValues<CSSCounterValue>(*this, other);
case CursorImageClass:
@@ -192,6 +195,8 @@ String CSSValue::cssText() const
return toCSSBorderImageSliceValue(this)->customCSSText();
case CanvasClass:
return toCSSCanvasValue(this)->customCSSText();
+ case ColorClass:
+ return toCSSColorValue(this)->customCSSText();
case CounterClass:
return toCSSCounterValue(this)->customCSSText();
case CursorImageClass:
@@ -278,6 +283,9 @@ void CSSValue::destroy()
case CanvasClass:
delete toCSSCanvasValue(this);
return;
+ case ColorClass:
+ delete toCSSColorValue(this);
+ return;
case CounterClass:
delete toCSSCounterValue(this);
return;
@@ -393,6 +401,9 @@ void CSSValue::finalizeGarbageCollectedObject()
case CanvasClass:
toCSSCanvasValue(this)->~CSSCanvasValue();
return;
+ case ColorClass:
+ toCSSColorValue(this)->~CSSColorValue();
+ return;
case CounterClass:
toCSSCounterValue(this)->~CSSCounterValue();
return;
@@ -508,6 +519,9 @@ DEFINE_TRACE(CSSValue)
case CanvasClass:
toCSSCanvasValue(this)->traceAfterDispatch(visitor);
return;
+ case ColorClass:
+ toCSSColorValue(this)->traceAfterDispatch(visitor);
+ return;
case CounterClass:
toCSSCounterValue(this)->traceAfterDispatch(visitor);
return;
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSValue.h ('k') | third_party/WebKit/Source/core/css/CSSValuePool.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698