| Index: Source/core/css/CSSValue.cpp
|
| diff --git a/Source/core/css/CSSValue.cpp b/Source/core/css/CSSValue.cpp
|
| index 802cd937cfe7bfae9d9a9137b371178fbf501739..c6b3cc0ec080a42a526a79d0550e39abbb9b83b9 100644
|
| --- a/Source/core/css/CSSValue.cpp
|
| +++ b/Source/core/css/CSSValue.cpp
|
| @@ -41,9 +41,13 @@
|
| #include "core/css/CSSInheritedValue.h"
|
| #include "core/css/CSSInitialValue.h"
|
| #include "core/css/CSSLineBoxContainValue.h"
|
| +#include "core/css/CSSMixFunctionValue.h"
|
| #include "core/css/CSSPrimitiveValue.h"
|
| #include "core/css/CSSReflectValue.h"
|
| +#include "core/css/CSSSVGDocumentValue.h"
|
| +#include "core/css/CSSShaderValue.h"
|
| #include "core/css/CSSTimingFunctionValue.h"
|
| +#include "core/css/CSSTransformValue.h"
|
| #include "core/css/CSSUnicodeRangeValue.h"
|
| #include "core/css/CSSValueList.h"
|
| #include "core/css/CSSVariableValue.h"
|
| @@ -52,10 +56,6 @@
|
| #include "core/css/ShadowValue.h"
|
| #include "core/css/WebKitCSSArrayFunctionValue.h"
|
| #include "core/css/WebKitCSSFilterValue.h"
|
| -#include "core/css/WebKitCSSMixFunctionValue.h"
|
| -#include "core/css/WebKitCSSSVGDocumentValue.h"
|
| -#include "core/css/WebKitCSSShaderValue.h"
|
| -#include "core/css/WebKitCSSTransformValue.h"
|
| #include "core/dom/WebCoreMemoryInstrumentation.h"
|
| #include "core/svg/SVGColor.h"
|
| #include "core/svg/SVGPaint.h"
|
| @@ -225,11 +225,11 @@ void CSSValue::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
|
| case WebKitCSSArrayFunctionValueClass:
|
| static_cast<const WebKitCSSArrayFunctionValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo);
|
| return;
|
| - case WebKitCSSMixFunctionValueClass:
|
| - static_cast<const WebKitCSSMixFunctionValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo);
|
| + case CSSMixFunctionValueClass:
|
| + static_cast<const CSSMixFunctionValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo);
|
| return;
|
| - case WebKitCSSShaderClass:
|
| - static_cast<const WebKitCSSShaderValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo);
|
| + case CSSShaderClass:
|
| + static_cast<const CSSShaderValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo);
|
| return;
|
| case VariableClass:
|
| static_cast<const CSSVariableValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo);
|
| @@ -240,8 +240,8 @@ void CSSValue::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
|
| case SVGPaintClass:
|
| static_cast<const SVGPaint*>(this)->reportDescendantMemoryUsage(memoryObjectInfo);
|
| return;
|
| - case WebKitCSSSVGDocumentClass:
|
| - static_cast<const WebKitCSSSVGDocumentValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo);
|
| + case CSSSVGDocumentClass:
|
| + static_cast<const CSSSVGDocumentValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo);
|
| return;
|
| case ValueListClass:
|
| toCSSValueList(this)->reportDescendantMemoryUsage(memoryObjectInfo);
|
| @@ -252,8 +252,8 @@ void CSSValue::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
|
| case WebKitCSSFilterClass:
|
| static_cast<const WebKitCSSFilterValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo);
|
| return;
|
| - case WebKitCSSTransformClass:
|
| - static_cast<const WebKitCSSTransformValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo);
|
| + case CSSTransformClass:
|
| + static_cast<const CSSTransformValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo);
|
| return;
|
| }
|
| ASSERT_NOT_REACHED();
|
| @@ -318,8 +318,8 @@ bool CSSValue::equals(const CSSValue& other) const
|
| return compareCSSValues<CSSUnicodeRangeValue>(*this, other);
|
| case ValueListClass:
|
| return compareCSSValues<CSSValueList>(*this, other);
|
| - case WebKitCSSTransformClass:
|
| - return compareCSSValues<WebKitCSSTransformValue>(*this, other);
|
| + case CSSTransformClass:
|
| + return compareCSSValues<CSSTransformValue>(*this, other);
|
| case LineBoxContainClass:
|
| return compareCSSValues<CSSLineBoxContainValue>(*this, other);
|
| case CalculationClass:
|
| @@ -330,18 +330,18 @@ bool CSSValue::equals(const CSSValue& other) const
|
| return compareCSSValues<WebKitCSSFilterValue>(*this, other);
|
| case WebKitCSSArrayFunctionValueClass:
|
| return compareCSSValues<WebKitCSSArrayFunctionValue>(*this, other);
|
| - case WebKitCSSMixFunctionValueClass:
|
| - return compareCSSValues<WebKitCSSMixFunctionValue>(*this, other);
|
| - case WebKitCSSShaderClass:
|
| - return compareCSSValues<WebKitCSSShaderValue>(*this, other);
|
| + case CSSMixFunctionValueClass:
|
| + return compareCSSValues<CSSMixFunctionValue>(*this, other);
|
| + case CSSShaderClass:
|
| + return compareCSSValues<CSSShaderValue>(*this, other);
|
| case VariableClass:
|
| return compareCSSValues<CSSVariableValue>(*this, other);
|
| case SVGColorClass:
|
| return compareCSSValues<SVGColor>(*this, other);
|
| case SVGPaintClass:
|
| return compareCSSValues<SVGPaint>(*this, other);
|
| - case WebKitCSSSVGDocumentClass:
|
| - return compareCSSValues<WebKitCSSSVGDocumentValue>(*this, other);
|
| + case CSSSVGDocumentClass:
|
| + return compareCSSValues<CSSSVGDocumentValue>(*this, other);
|
| default:
|
| ASSERT_NOT_REACHED();
|
| return false;
|
| @@ -406,8 +406,8 @@ String CSSValue::cssText() const
|
| return static_cast<const CSSUnicodeRangeValue*>(this)->customCssText();
|
| case ValueListClass:
|
| return toCSSValueList(this)->customCssText();
|
| - case WebKitCSSTransformClass:
|
| - return static_cast<const WebKitCSSTransformValue*>(this)->customCssText();
|
| + case CSSTransformClass:
|
| + return static_cast<const CSSTransformValue*>(this)->customCssText();
|
| case LineBoxContainClass:
|
| return static_cast<const CSSLineBoxContainValue*>(this)->customCssText();
|
| case CalculationClass:
|
| @@ -418,18 +418,18 @@ String CSSValue::cssText() const
|
| return static_cast<const WebKitCSSFilterValue*>(this)->customCssText();
|
| case WebKitCSSArrayFunctionValueClass:
|
| return static_cast<const WebKitCSSArrayFunctionValue*>(this)->customCssText();
|
| - case WebKitCSSMixFunctionValueClass:
|
| - return static_cast<const WebKitCSSMixFunctionValue*>(this)->customCssText();
|
| - case WebKitCSSShaderClass:
|
| - return static_cast<const WebKitCSSShaderValue*>(this)->customCssText();
|
| + case CSSMixFunctionValueClass:
|
| + return static_cast<const CSSMixFunctionValue*>(this)->customCssText();
|
| + case CSSShaderClass:
|
| + return static_cast<const CSSShaderValue*>(this)->customCssText();
|
| case VariableClass:
|
| return static_cast<const CSSVariableValue*>(this)->value();
|
| case SVGColorClass:
|
| return static_cast<const SVGColor*>(this)->customCssText();
|
| case SVGPaintClass:
|
| return static_cast<const SVGPaint*>(this)->customCssText();
|
| - case WebKitCSSSVGDocumentClass:
|
| - return static_cast<const WebKitCSSSVGDocumentValue*>(this)->customCssText();
|
| + case CSSSVGDocumentClass:
|
| + return static_cast<const CSSSVGDocumentValue*>(this)->customCssText();
|
| }
|
| ASSERT_NOT_REACHED();
|
| return String();
|
| @@ -444,8 +444,8 @@ String CSSValue::serializeResolvingVariables(const HashMap<AtomicString, String>
|
| return static_cast<const CSSReflectValue*>(this)->customSerializeResolvingVariables(variables);
|
| case ValueListClass:
|
| return toCSSValueList(this)->customSerializeResolvingVariables(variables);
|
| - case WebKitCSSTransformClass:
|
| - return static_cast<const WebKitCSSTransformValue*>(this)->customSerializeResolvingVariables(variables);
|
| + case CSSTransformClass:
|
| + return static_cast<const CSSTransformValue*>(this)->customSerializeResolvingVariables(variables);
|
| default:
|
| return cssText();
|
| }
|
| @@ -527,8 +527,8 @@ void CSSValue::destroy()
|
| case ValueListClass:
|
| delete toCSSValueList(this);
|
| return;
|
| - case WebKitCSSTransformClass:
|
| - delete static_cast<WebKitCSSTransformValue*>(this);
|
| + case CSSTransformClass:
|
| + delete static_cast<CSSTransformValue*>(this);
|
| return;
|
| case LineBoxContainClass:
|
| delete static_cast<CSSLineBoxContainValue*>(this);
|
| @@ -545,11 +545,11 @@ void CSSValue::destroy()
|
| case WebKitCSSArrayFunctionValueClass:
|
| delete static_cast<WebKitCSSArrayFunctionValue*>(this);
|
| return;
|
| - case WebKitCSSMixFunctionValueClass:
|
| - delete static_cast<WebKitCSSMixFunctionValue*>(this);
|
| + case CSSMixFunctionValueClass:
|
| + delete static_cast<CSSMixFunctionValue*>(this);
|
| return;
|
| - case WebKitCSSShaderClass:
|
| - delete static_cast<WebKitCSSShaderValue*>(this);
|
| + case CSSShaderClass:
|
| + delete static_cast<CSSShaderValue*>(this);
|
| return;
|
| case VariableClass:
|
| delete static_cast<CSSVariableValue*>(this);
|
| @@ -560,8 +560,8 @@ void CSSValue::destroy()
|
| case SVGPaintClass:
|
| delete static_cast<SVGPaint*>(this);
|
| return;
|
| - case WebKitCSSSVGDocumentClass:
|
| - delete static_cast<WebKitCSSSVGDocumentValue*>(this);
|
| + case CSSSVGDocumentClass:
|
| + delete static_cast<CSSSVGDocumentValue*>(this);
|
| return;
|
| }
|
| ASSERT_NOT_REACHED();
|
| @@ -581,10 +581,10 @@ PassRefPtr<CSSValue> CSSValue::cloneForCSSOM() const
|
| return static_cast<const WebKitCSSFilterValue*>(this)->cloneForCSSOM();
|
| case WebKitCSSArrayFunctionValueClass:
|
| return static_cast<const WebKitCSSArrayFunctionValue*>(this)->cloneForCSSOM();
|
| - case WebKitCSSMixFunctionValueClass:
|
| - return static_cast<const WebKitCSSMixFunctionValue*>(this)->cloneForCSSOM();
|
| - case WebKitCSSTransformClass:
|
| - return static_cast<const WebKitCSSTransformValue*>(this)->cloneForCSSOM();
|
| + case CSSMixFunctionValueClass:
|
| + return static_cast<const CSSMixFunctionValue*>(this)->cloneForCSSOM();
|
| + case CSSTransformClass:
|
| + return static_cast<const CSSTransformValue*>(this)->cloneForCSSOM();
|
| case ImageSetClass:
|
| return static_cast<const CSSImageSetValue*>(this)->cloneForCSSOM();
|
| case SVGColorClass:
|
|
|