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

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

Issue 189913012: Merge SVGColor into SVGPaint (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix system color test Created 6 years, 9 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 | « Source/core/css/CSSValue.h ('k') | Source/core/css/parser/CSSPropertyParser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/CSSValue.cpp
diff --git a/Source/core/css/CSSValue.cpp b/Source/core/css/CSSValue.cpp
index d093a2d6bed0f63f59dad92b6b35a43883e06068..0c8be3b2cb2b2fba90ac505969bd00a858492539 100644
--- a/Source/core/css/CSSValue.cpp
+++ b/Source/core/css/CSSValue.cpp
@@ -55,7 +55,6 @@
#include "core/css/CSSTransformValue.h"
#include "core/css/CSSUnicodeRangeValue.h"
#include "core/css/CSSValueList.h"
-#include "core/svg/SVGColor.h"
#include "core/svg/SVGPaint.h"
namespace WebCore {
@@ -200,8 +199,6 @@ bool CSSValue::equals(const CSSValue& other) const
return compareCSSValues<CSSFilterValue>(*this, other);
case CSSArrayFunctionValueClass:
return compareCSSValues<CSSArrayFunctionValue>(*this, other);
- case SVGColorClass:
- return compareCSSValues<SVGColor>(*this, other);
case SVGPaintClass:
return compareCSSValues<SVGPaint>(*this, other);
case CSSSVGDocumentClass:
@@ -284,8 +281,6 @@ String CSSValue::cssText() const
return toCSSFilterValue(this)->customCSSText();
case CSSArrayFunctionValueClass:
return toCSSArrayFunctionValue(this)->customCSSText();
- case SVGColorClass:
- return toSVGColor(this)->customCSSText();
case SVGPaintClass:
return toSVGPaint(this)->customCSSText();
case CSSSVGDocumentClass:
@@ -392,9 +387,6 @@ void CSSValue::destroy()
case CSSArrayFunctionValueClass:
delete toCSSArrayFunctionValue(this);
return;
- case SVGColorClass:
- delete toSVGColor(this);
- return;
case SVGPaintClass:
delete toSVGPaint(this);
return;
@@ -502,9 +494,6 @@ void CSSValue::finalize()
case CSSArrayFunctionValueClass:
static_cast<CSSArrayFunctionValue*>(this)->~CSSArrayFunctionValue();
return;
- case SVGColorClass:
- static_cast<SVGColor*>(this)->~SVGColor();
- return;
case SVGPaintClass:
static_cast<SVGPaint*>(this)->~SVGPaint();
return;
@@ -612,9 +601,6 @@ void CSSValue::trace(Visitor* visitor)
case CSSArrayFunctionValueClass:
static_cast<CSSArrayFunctionValue*>(this)->traceAfterDispatch(visitor);
return;
- case SVGColorClass:
- static_cast<SVGColor*>(this)->traceAfterDispatch(visitor);
- return;
case SVGPaintClass:
static_cast<SVGPaint*>(this)->traceAfterDispatch(visitor);
return;
@@ -643,8 +629,6 @@ PassRefPtrWillBeRawPtr<CSSValue> CSSValue::cloneForCSSOM() const
return toCSSTransformValue(this)->cloneForCSSOM();
case ImageSetClass:
return toCSSImageSetValue(this)->cloneForCSSOM();
- case SVGColorClass:
- return toSVGColor(this)->cloneForCSSOM();
case SVGPaintClass:
return toSVGPaint(this)->cloneForCSSOM();
default:
« no previous file with comments | « Source/core/css/CSSValue.h ('k') | Source/core/css/parser/CSSPropertyParser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698