Changeset 157286 in webkit for trunk/Source/WebCore/css/CSSValue.cpp

Timestamp:

Oct 10, 2013, 8:37:18 PM (12 years ago)

Author:

[email protected]

Message:

Add toSVGColor|Paint() to cleanup static_cast<>, and use it
​https://bugs.webkit.org/show_bug.cgi?id=122630

Reviewed by Andreas Kling.

SVGColor and SVGPaint can't use CSS_VALUE_TYPE_CASTS(), this cl adds
toSVGColor() and toSVGPaint() manually. Those functions will help to
detect bad type cast.

• css/CSSValue.cpp:

(WebCore::CSSValue::cssText):
(WebCore::CSSValue::destroy):
(WebCore::CSSValue::cloneForCSSOM):

• css/SVGCSSStyleSelector.cpp:

(WebCore::StyleResolver::applySVGProperty):

• svg/SVGColor.h:

(WebCore::toSVGColor):

• svg/SVGPaint.h:

(WebCore::toSVGPaint):

File:

• trunk/Source/WebCore/css/CSSValue.cpp (modified) (3 diffs)

trunk/Source/WebCore/css/CSSValue.cpp

@@ -350 +350 @@
 #if ENABLE(SVG)
     case SVGColorClass:
-        return static_cast<const SVGColor*>(this)->customCSSText();
+        return toSVGColor(this)->customCSSText();
     case SVGPaintClass:
-        return static_cast<const SVGPaint*>(this)->customCSSText();
+        return toSVGPaint(this)->customCSSText();
     case WebKitCSSSVGDocumentClass:
         return toWebKitCSSSVGDocumentValue(this)->customCSSText();
@@ -498 +498 @@
 #if ENABLE(SVG)
     case SVGColorClass:
-        delete static_cast<SVGColor*>(this);
+        delete toSVGColor(this);
         return;
     case SVGPaintClass:
-        delete static_cast<SVGPaint*>(this);
+        delete toSVGPaint(this);
         return;
     case WebKitCSSSVGDocumentClass:
@@ -541 +541 @@
 #if ENABLE(SVG)
     case SVGColorClass:
-        return static_cast<const SVGColor*>(this)->cloneForCSSOM();
+        return toSVGColor(this)->cloneForCSSOM();
     case SVGPaintClass:
-        return static_cast<const SVGPaint*>(this)->cloneForCSSOM();
+        return toSVGPaint(this)->cloneForCSSOM();
 #endif
     default: