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

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

Issue 13839016: Remove CSS_SHADERS compile-time flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 8 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/WebCore/css/CSSValue.cpp
diff --git a/Source/WebCore/css/CSSValue.cpp b/Source/WebCore/css/CSSValue.cpp
index 6cdfcffa368c2207dc7adc5defffbb6f93cc6041..ab4af02933ff726439c60c409c7d5e05376e638a 100644
--- a/Source/WebCore/css/CSSValue.cpp
+++ b/Source/WebCore/css/CSSValue.cpp
@@ -227,7 +227,6 @@ void CSSValue::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
case CalculationClass:
static_cast<const CSSCalcValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo);
return;
-#if ENABLE(CSS_FILTERS) && ENABLE(CSS_SHADERS)
eseidel 2013/04/09 18:30:08 CSS_FILTERS?
case WebKitCSSArrayFunctionValueClass:
static_cast<const WebKitCSSArrayFunctionValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo);
return;
@@ -237,7 +236,6 @@ void CSSValue::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
case WebKitCSSShaderClass:
static_cast<const WebKitCSSShaderValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo);
return;
-#endif
case VariableClass:
static_cast<const CSSVariableValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo);
return;
@@ -344,7 +342,6 @@ bool CSSValue::equals(const CSSValue& other) const
#if ENABLE(CSS_FILTERS)
case WebKitCSSFilterClass:
return compareCSSValues<WebKitCSSFilterValue>(*this, other);
-#if ENABLE(CSS_SHADERS)
case WebKitCSSArrayFunctionValueClass:
return compareCSSValues<WebKitCSSArrayFunctionValue>(*this, other);
case WebKitCSSMixFunctionValueClass:
@@ -352,7 +349,6 @@ bool CSSValue::equals(const CSSValue& other) const
case WebKitCSSShaderClass:
return compareCSSValues<WebKitCSSShaderValue>(*this, other);
#endif
-#endif
case VariableClass:
return compareCSSValues<CSSVariableValue>(*this, other);
#if ENABLE(SVG)
@@ -440,7 +436,6 @@ String CSSValue::cssText() const
#if ENABLE(CSS_FILTERS)
case WebKitCSSFilterClass:
return static_cast<const WebKitCSSFilterValue*>(this)->customCssText();
-#if ENABLE(CSS_SHADERS)
case WebKitCSSArrayFunctionValueClass:
return static_cast<const WebKitCSSArrayFunctionValue*>(this)->customCssText();
case WebKitCSSMixFunctionValueClass:
@@ -448,7 +443,6 @@ String CSSValue::cssText() const
case WebKitCSSShaderClass:
return static_cast<const WebKitCSSShaderValue*>(this)->customCssText();
#endif
-#endif
case VariableClass:
return static_cast<const CSSVariableValue*>(this)->value();
#if ENABLE(SVG)
@@ -574,7 +568,6 @@ void CSSValue::destroy()
case WebKitCSSFilterClass:
delete static_cast<WebKitCSSFilterValue*>(this);
return;
-#if ENABLE(CSS_SHADERS)
case WebKitCSSArrayFunctionValueClass:
delete static_cast<WebKitCSSArrayFunctionValue*>(this);
return;
@@ -585,7 +578,6 @@ void CSSValue::destroy()
delete static_cast<WebKitCSSShaderValue*>(this);
return;
#endif
-#endif
case VariableClass:
delete static_cast<CSSVariableValue*>(this);
return;
@@ -617,13 +609,11 @@ PassRefPtr<CSSValue> CSSValue::cloneForCSSOM() const
#if ENABLE(CSS_FILTERS)
case WebKitCSSFilterClass:
return static_cast<const WebKitCSSFilterValue*>(this)->cloneForCSSOM();
-#if ENABLE(CSS_SHADERS)
case WebKitCSSArrayFunctionValueClass:
return static_cast<const WebKitCSSArrayFunctionValue*>(this)->cloneForCSSOM();
case WebKitCSSMixFunctionValueClass:
return static_cast<const WebKitCSSMixFunctionValue*>(this)->cloneForCSSOM();
#endif
-#endif
case WebKitCSSTransformClass:
return static_cast<const WebKitCSSTransformValue*>(this)->cloneForCSSOM();
#if ENABLE(CSS_IMAGE_SET)

Powered by Google App Engine
This is Rietveld 408576698