Use DEFINE_CSS_VALUE_TYPE_CASTS() for SVGColor, SVGPaint, and TextCloneCSSValue

Source/core/css/CSSValue.cpp

 /*
  * Copyright (C) 2011 Andreas Kling (kling@webkit.org)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 67 matching lines @@
     TextCloneCSSValue(ClassType classType, const String& text)
         : CSSValue(classType, /*isCSSOMSafe*/ true)
         , m_cssText(text)
     {
         m_isTextClone = true;
     }
 
     String m_cssText;
 };
 
+// This will catch anyone doing an unnecessary cast.
+void toTextCloneCSSValue(const TextCloneCSSValue*);

[esprehn, 2013/10/15 01:17:41]

We should just fix the macros. DEFINE_NODE_TYPE_CASTS(TextCloneCSSValue,
isTextCloneCSSValue()) would have been fine here. I don't know why the CSSValue
version of that macro isn't as flexible.

[gyuyoung-inactive, 2013/10/15 01:46:27]

Yes, good idea. It looks we can change DEFINE_NODE_TYPE_CASTS as flexible.

[gyuyoung-inactive, 2013/10/15 03:36:49]

I upload a patch for this.
https://chromiumcodereview.appspot.com/26145005/

+
+inline TextCloneCSSValue* toTextCloneCSSValue(CSSValue* value)
+{
+    ASSERT_WITH_SECURITY_IMPLICATION(!value || value->isTextCloneCSSValue());
+    return static_cast<TextCloneCSSValue*>(value);
+}
+
+inline const TextCloneCSSValue* toTextCloneCSSValue(const CSSValue* value)
+{
+    ASSERT_WITH_SECURITY_IMPLICATION(!value || value->isTextCloneCSSValue());
+    return static_cast<const TextCloneCSSValue*>(value);
+}
+
 bool CSSValue::isImplicitInitialValue() const
 {
     return m_classType == InitialClass && toCSSInitialValue(this)->isImplicit();
 }
 
 CSSValue::Type CSSValue::cssValueType() const
 {
     if (isInheritedValue())
         return CSS_INHERIT;
     if (isPrimitiveValue())
@@ skipping 42 matching lines @@
 template<class ChildClassType>
 inline static bool compareCSSValues(const CSSValue& first, const CSSValue& second)
 {
     return static_cast<const ChildClassType&>(first).equals(static_cast<const ChildClassType&>(second));
 }
 
 bool CSSValue::equals(const CSSValue& other) const
 {
     if (m_isTextClone) {
         ASSERT(isCSSOMSafe());
-        return static_cast<const TextCloneCSSValue*>(this)->cssText() == other.cssText();
+        return toTextCloneCSSValue(this)->cssText() == other.cssText();
     }
 
     if (m_classType == other.m_classType) {
         switch (m_classType) {
         case AspectRatioClass:
             return compareCSSValues<CSSAspectRatioValue>(*this, other);
         case BorderImageSliceClass:
             return compareCSSValues<CSSBorderImageSliceValue>(*this, other);
         case CanvasClass:
             return compareCSSValues<CSSCanvasValue>(*this, other);
@@ skipping 66 matching lines @@
     } else if (m_classType == ValueListClass && other.m_classType != ValueListClass)
         return toCSSValueList(this)->equals(other);
     else if (m_classType != ValueListClass && other.m_classType == ValueListClass)
         return static_cast<const CSSValueList&>(other).equals(*this);
     return false;
 }
 
 String CSSValue::cssText() const
 {
     if (m_isTextClone) {
-         ASSERT(isCSSOMSafe());
-        return static_cast<const TextCloneCSSValue*>(this)->cssText();
+        ASSERT(isCSSOMSafe());
+        return toTextCloneCSSValue(this)->cssText();
     }
     ASSERT(!isCSSOMSafe() || isSubtypeExposedToCSSOM());
 
     switch (classType()) {
     case AspectRatioClass:
         return toCSSAspectRatioValue(this)->customCssText();
     case BorderImageSliceClass:
         return toCSSBorderImageSliceValue(this)->customCssText();
     case CanvasClass:
         return toCSSCanvasValue(this)->customCssText();
@@ skipping 77 matching lines @@
         return toCSSTransformValue(this)->customSerializeResolvingVariables(variables);
     default:
         return cssText();
     }
 }
 
 void CSSValue::destroy()
 {
     if (m_isTextClone) {
         ASSERT(isCSSOMSafe());
-        delete static_cast<TextCloneCSSValue*>(this);
+        delete toTextCloneCSSValue(this);
         return;
     }
     ASSERT(!isCSSOMSafe() || isSubtypeExposedToCSSOM());
 
     switch (classType()) {
     case AspectRatioClass:
         delete toCSSAspectRatioValue(this);
         return;
     case BorderImageSliceClass:
         delete toCSSBorderImageSliceValue(this);
@@ skipping 122 matching lines @@
         return toSVGColor(this)->cloneForCSSOM();
     case SVGPaintClass:
         return toSVGPaint(this)->cloneForCSSOM();
     default:
         ASSERT(!isSubtypeExposedToCSSOM());
         return TextCloneCSSValue::create(classType(), cssText());
     }
 }
 
 }