summaryrefslogtreecommitdiff
path: root/Source/WebCore/css/CSSValue.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-02-03 09:55:33 +0100
committerSimon Hausmann <simon.hausmann@nokia.com>2012-02-03 09:55:33 +0100
commitcd44dc59cdfc39534aef4d417e9f3c412e3be139 (patch)
tree8d89889ba95ed6ec9322e733846cc9cce9d7dff1 /Source/WebCore/css/CSSValue.cpp
parentd11f84f5b5cdc0d92a08af01b13472fdd5f9acb9 (diff)
downloadqtwebkit-cd44dc59cdfc39534aef4d417e9f3c412e3be139.tar.gz
Imported WebKit commit fce473cb4d55aa9fe9d0b0322a2fffecb731b961 (http://svn.webkit.org/repository/webkit/trunk@106560)
Diffstat (limited to 'Source/WebCore/css/CSSValue.cpp')
-rw-r--r--Source/WebCore/css/CSSValue.cpp14
1 files changed, 6 insertions, 8 deletions
diff --git a/Source/WebCore/css/CSSValue.cpp b/Source/WebCore/css/CSSValue.cpp
index 711e4c5ed..016cb0bba 100644
--- a/Source/WebCore/css/CSSValue.cpp
+++ b/Source/WebCore/css/CSSValue.cpp
@@ -28,8 +28,8 @@
#include "CSSValue.h"
#include "CSSAspectRatioValue.h"
-#include "CSSBorderImageValue.h"
#include "CSSBorderImageSliceValue.h"
+#include "CSSCalculationValue.h"
#include "CSSCanvasValue.h"
#include "CSSCrossfadeValue.h"
#include "CSSCursorImageValue.h"
@@ -89,8 +89,6 @@ void CSSValue::addSubresourceStyleURLs(ListHashSet<KURL>& urls, const CSSStyleSh
static_cast<CSSPrimitiveValue*>(this)->addSubresourceStyleURLs(urls, styleSheet);
else if (isValueList())
static_cast<CSSValueList*>(this)->addSubresourceStyleURLs(urls, styleSheet);
- else if (classType() == BorderImageClass)
- static_cast<CSSBorderImageValue*>(this)->addSubresourceStyleURLs(urls, styleSheet);
else if (classType() == FontFaceSrcClass)
static_cast<CSSFontFaceSrcValue*>(this)->addSubresourceStyleURLs(urls, styleSheet);
else if (classType() == ReflectClass)
@@ -102,8 +100,6 @@ String CSSValue::cssText() const
switch (classType()) {
case AspectRatioClass:
return static_cast<const CSSAspectRatioValue*>(this)->customCssText();
- case BorderImageClass:
- return static_cast<const CSSBorderImageValue*>(this)->customCssText();
case BorderImageSliceClass:
return static_cast<const CSSBorderImageSliceValue*>(this)->customCssText();
case CanvasClass:
@@ -154,6 +150,8 @@ String CSSValue::cssText() const
return static_cast<const CSSLineBoxContainValue*>(this)->customCssText();
case FlexClass:
return static_cast<const CSSFlexValue*>(this)->customCssText();
+ case CalculationClass:
+ return static_cast<const CSSCalcValue*>(this)->customCssText();
#if ENABLE(CSS_FILTERS)
case WebKitCSSFilterClass:
return static_cast<const WebKitCSSFilterValue*>(this)->customCssText();
@@ -179,9 +177,6 @@ void CSSValue::destroy()
case AspectRatioClass:
delete static_cast<CSSAspectRatioValue*>(this);
return;
- case BorderImageClass:
- delete static_cast<CSSBorderImageValue*>(this);
- return;
case BorderImageSliceClass:
delete static_cast<CSSBorderImageSliceValue*>(this);
return;
@@ -257,6 +252,9 @@ void CSSValue::destroy()
case FlexClass:
delete static_cast<CSSFlexValue*>(this);
return;
+ case CalculationClass:
+ delete static_cast<CSSCalcValue*>(this);
+ return;
#if ENABLE(CSS_FILTERS)
case WebKitCSSFilterClass:
delete static_cast<WebKitCSSFilterValue*>(this);