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

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

Issue 1306823004: Split out String, URI and CustomIdent from CSSPrimitiveValue (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@split_out_attr_values
Patch Set: Fixing tests 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: Source/core/css/CSSValue.cpp
diff --git a/Source/core/css/CSSValue.cpp b/Source/core/css/CSSValue.cpp
index 7d5d4acee8a3b3d2c306128f320367acd26256ac..4798712c6fa9e90340ea48966546eacd569819c4 100644
--- a/Source/core/css/CSSValue.cpp
+++ b/Source/core/css/CSSValue.cpp
@@ -49,6 +49,7 @@
#include "core/css/CSSReflectValue.h"
#include "core/css/CSSSVGDocumentValue.h"
#include "core/css/CSSShadowValue.h"
+#include "core/css/CSSStringValueBase.h"
#include "core/css/CSSTimingFunctionValue.h"
#include "core/css/CSSUnicodeRangeValue.h"
#include "core/css/CSSUnsetValue.h"
@@ -114,6 +115,8 @@ bool CSSValue::equals(const CSSValue& other) const
return compareCSSValues<CSSRadialGradientValue>(*this, other);
case CrossfadeClass:
return compareCSSValues<CSSCrossfadeValue>(*this, other);
+ case CustomIdentClass:
+ return compareCSSValues<CSSCustomIdentValue>(*this, other);
case ImageClass:
return compareCSSValues<CSSImageValue>(*this, other);
case InheritedClass:
@@ -136,12 +139,16 @@ bool CSSValue::equals(const CSSValue& other) const
return compareCSSValues<CSSReflectValue>(*this, other);
case ShadowClass:
return compareCSSValues<CSSShadowValue>(*this, other);
+ case StringClass:
+ return compareCSSValues<CSSStringValue>(*this, other);
case CubicBezierTimingFunctionClass:
return compareCSSValues<CSSCubicBezierTimingFunctionValue>(*this, other);
case StepsTimingFunctionClass:
return compareCSSValues<CSSStepsTimingFunctionValue>(*this, other);
case UnicodeRangeClass:
return compareCSSValues<CSSUnicodeRangeValue>(*this, other);
+ case URIClass:
+ return compareCSSValues<CSSURIValue>(*this, other);
case ValueListClass:
return compareCSSValues<CSSValueList>(*this, other);
case ValuePairClass:
@@ -182,6 +189,8 @@ String CSSValue::cssText() const
return toCSSRadialGradientValue(this)->customCSSText();
case CrossfadeClass:
return toCSSCrossfadeValue(this)->customCSSText();
+ case CustomIdentClass:
+ return toCSSCustomIdentValue(this)->customCSSText();
case ImageClass:
return toCSSImageValue(this)->customCSSText();
case InheritedClass:
@@ -204,12 +213,16 @@ String CSSValue::cssText() const
return toCSSReflectValue(this)->customCSSText();
case ShadowClass:
return toCSSShadowValue(this)->customCSSText();
+ case StringClass:
+ return toCSSStringValue(this)->customCSSText();
case CubicBezierTimingFunctionClass:
return toCSSCubicBezierTimingFunctionValue(this)->customCSSText();
case StepsTimingFunctionClass:
return toCSSStepsTimingFunctionValue(this)->customCSSText();
case UnicodeRangeClass:
return toCSSUnicodeRangeValue(this)->customCSSText();
+ case URIClass:
+ return toCSSURIValue(this)->customCSSText();
case ValuePairClass:
return toCSSValuePair(this)->customCSSText();
case ValueListClass:
@@ -258,6 +271,9 @@ void CSSValue::destroy()
case CrossfadeClass:
delete toCSSCrossfadeValue(this);
return;
+ case CustomIdentClass:
+ delete toCSSCustomIdentValue(this);
+ return;
case ImageClass:
delete toCSSImageValue(this);
return;
@@ -291,6 +307,9 @@ void CSSValue::destroy()
case ShadowClass:
delete toCSSShadowValue(this);
return;
+ case StringClass:
+ delete toCSSStringValue(this);
+ return;
case CubicBezierTimingFunctionClass:
delete toCSSCubicBezierTimingFunctionValue(this);
return;
@@ -300,6 +319,9 @@ void CSSValue::destroy()
case UnicodeRangeClass:
delete toCSSUnicodeRangeValue(this);
return;
+ case URIClass:
+ delete toCSSURIValue(this);
+ return;
case ValuePairClass:
delete toCSSValuePair(this);
return;
@@ -352,6 +374,9 @@ void CSSValue::finalizeGarbageCollectedObject()
case CrossfadeClass:
toCSSCrossfadeValue(this)->~CSSCrossfadeValue();
return;
+ case CustomIdentClass:
+ toCSSCustomIdentValue(this)->~CSSCustomIdentValue();
+ return;
case ImageClass:
toCSSImageValue(this)->~CSSImageValue();
return;
@@ -385,6 +410,9 @@ void CSSValue::finalizeGarbageCollectedObject()
case ShadowClass:
toCSSShadowValue(this)->~CSSShadowValue();
return;
+ case StringClass:
+ toCSSStringValue(this)->~CSSStringValue();
+ return;
case CubicBezierTimingFunctionClass:
toCSSCubicBezierTimingFunctionValue(this)->~CSSCubicBezierTimingFunctionValue();
return;
@@ -394,6 +422,9 @@ void CSSValue::finalizeGarbageCollectedObject()
case UnicodeRangeClass:
toCSSUnicodeRangeValue(this)->~CSSUnicodeRangeValue();
return;
+ case URIClass:
+ toCSSURIValue(this)->~CSSURIValue();
+ return;
case ValueListClass:
toCSSValueList(this)->~CSSValueList();
return;
@@ -446,6 +477,9 @@ DEFINE_TRACE(CSSValue)
case CrossfadeClass:
toCSSCrossfadeValue(this)->traceAfterDispatch(visitor);
return;
+ case CustomIdentClass:
+ toCSSCustomIdentValue(this)->traceAfterDispatch(visitor);
+ return;
case ImageClass:
toCSSImageValue(this)->traceAfterDispatch(visitor);
return;
@@ -479,6 +513,9 @@ DEFINE_TRACE(CSSValue)
case ShadowClass:
toCSSShadowValue(this)->traceAfterDispatch(visitor);
return;
+ case StringClass:
+ toCSSStringValue(this)->traceAfterDispatch(visitor);
+ return;
case CubicBezierTimingFunctionClass:
toCSSCubicBezierTimingFunctionValue(this)->traceAfterDispatch(visitor);
return;
@@ -488,6 +525,9 @@ DEFINE_TRACE(CSSValue)
case UnicodeRangeClass:
toCSSUnicodeRangeValue(this)->traceAfterDispatch(visitor);
return;
+ case URIClass:
+ toCSSURIValue(this)->traceAfterDispatch(visitor);
+ return;
case ValueListClass:
toCSSValueList(this)->traceAfterDispatch(visitor);
return;

Powered by Google App Engine
This is Rietveld 408576698