Merge SVGColor into SVGPaint

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 37 matching lines @@
 #include "core/css/CSSInitialValue.h"
 #include "core/css/CSSLineBoxContainValue.h"
 #include "core/css/CSSPrimitiveValue.h"
 #include "core/css/CSSReflectValue.h"
 #include "core/css/CSSSVGDocumentValue.h"
 #include "core/css/CSSShadowValue.h"
 #include "core/css/CSSTimingFunctionValue.h"
 #include "core/css/CSSTransformValue.h"
 #include "core/css/CSSUnicodeRangeValue.h"
 #include "core/css/CSSValueList.h"
-#include "core/svg/SVGColor.h"
 #include "core/svg/SVGPaint.h"
 
 namespace WebCore {
 
 struct SameSizeAsCSSValue : public RefCountedWillBeRefCountedGarbageCollected<SameSizeAsCSSValue> {
     uint32_t bitfields;
 };
 
 COMPILE_ASSERT(sizeof(CSSValue) <= sizeof(SameSizeAsCSSValue), CSS_value_should_stay_small);
 
@@ skipping 124 matching lines @@
         case LineBoxContainClass:
             return compareCSSValues<CSSLineBoxContainValue>(*this, other);
         case CalculationClass:
             return compareCSSValues<CSSCalcValue>(*this, other);
         case ImageSetClass:
             return compareCSSValues<CSSImageSetValue>(*this, other);
         case CSSFilterClass:
             return compareCSSValues<CSSFilterValue>(*this, other);
         case CSSArrayFunctionValueClass:
             return compareCSSValues<CSSArrayFunctionValue>(*this, other);
-        case SVGColorClass:
-            return compareCSSValues<SVGColor>(*this, other);
         case SVGPaintClass:
             return compareCSSValues<SVGPaint>(*this, other);
         case CSSSVGDocumentClass:
             return compareCSSValues<CSSSVGDocumentValue>(*this, other);
         default:
             ASSERT_NOT_REACHED();
             return false;
         }
     } else if (m_classType == ValueListClass && other.m_classType != ValueListClass)
         return toCSSValueList(this)->equals(other);
@@ skipping 62 matching lines @@
     case LineBoxContainClass:
         return toCSSLineBoxContainValue(this)->customCSSText();
     case CalculationClass:
         return toCSSCalcValue(this)->customCSSText();
     case ImageSetClass:
         return toCSSImageSetValue(this)->customCSSText();
     case CSSFilterClass:
         return toCSSFilterValue(this)->customCSSText();
     case CSSArrayFunctionValueClass:
         return toCSSArrayFunctionValue(this)->customCSSText();
-    case SVGColorClass:
-        return toSVGColor(this)->customCSSText();
     case SVGPaintClass:
         return toSVGPaint(this)->customCSSText();
     case CSSSVGDocumentClass:
         return toCSSSVGDocumentValue(this)->customCSSText();
     }
     ASSERT_NOT_REACHED();
     return String();
 }
 
 void CSSValue::destroy()
@@ skipping 86 matching lines @@
         return;
     case ImageSetClass:
         delete toCSSImageSetValue(this);
         return;
     case CSSFilterClass:
         delete toCSSFilterValue(this);
         return;
     case CSSArrayFunctionValueClass:
         delete toCSSArrayFunctionValue(this);
         return;
-    case SVGColorClass:
-        delete toSVGColor(this);
-        return;
     case SVGPaintClass:
         delete toSVGPaint(this);
         return;
     case CSSSVGDocumentClass:
         delete toCSSSVGDocumentValue(this);
         return;
     }
     ASSERT_NOT_REACHED();
 }
 
@@ skipping 87 matching lines @@
         return;
     case ImageSetClass:
         static_cast<CSSImageSetValue*>(this)->~CSSImageSetValue();
         return;
     case CSSFilterClass:
         static_cast<CSSFilterValue*>(this)->~CSSFilterValue();
         return;
     case CSSArrayFunctionValueClass:
         static_cast<CSSArrayFunctionValue*>(this)->~CSSArrayFunctionValue();
         return;
-    case SVGColorClass:
-        static_cast<SVGColor*>(this)->~SVGColor();
-        return;
     case SVGPaintClass:
         static_cast<SVGPaint*>(this)->~SVGPaint();
         return;
     case CSSSVGDocumentClass:
         static_cast<CSSSVGDocumentValue*>(this)->~CSSSVGDocumentValue();
         return;
     }
     ASSERT_NOT_REACHED();
 }
 
@@ skipping 87 matching lines @@
         return;
     case ImageSetClass:
         static_cast<CSSImageSetValue*>(this)->traceAfterDispatch(visitor);
         return;
     case CSSFilterClass:
         static_cast<CSSFilterValue*>(this)->traceAfterDispatch(visitor);
         return;
     case CSSArrayFunctionValueClass:
         static_cast<CSSArrayFunctionValue*>(this)->traceAfterDispatch(visitor);
         return;
-    case SVGColorClass:
-        static_cast<SVGColor*>(this)->traceAfterDispatch(visitor);
-        return;
     case SVGPaintClass:
         static_cast<SVGPaint*>(this)->traceAfterDispatch(visitor);
         return;
     case CSSSVGDocumentClass:
         static_cast<CSSSVGDocumentValue*>(this)->traceAfterDispatch(visitor);
         return;
     }
     ASSERT_NOT_REACHED();
 }
 
 PassRefPtrWillBeRawPtr<CSSValue> CSSValue::cloneForCSSOM() const
 {
     switch (classType()) {
     case PrimitiveClass:
         return toCSSPrimitiveValue(this)->cloneForCSSOM();
     case ValueListClass:
         return toCSSValueList(this)->cloneForCSSOM();
     case ImageClass:
     case CursorImageClass:
         return toCSSImageValue(this)->cloneForCSSOM();
     case CSSFilterClass:
         return toCSSFilterValue(this)->cloneForCSSOM();
     case CSSArrayFunctionValueClass:
         return toCSSArrayFunctionValue(this)->cloneForCSSOM();
     case CSSTransformClass:
         return toCSSTransformValue(this)->cloneForCSSOM();
     case ImageSetClass:
         return toCSSImageSetValue(this)->cloneForCSSOM();
-    case SVGColorClass:
-        return toSVGColor(this)->cloneForCSSOM();
     case SVGPaintClass:
         return toSVGPaint(this)->cloneForCSSOM();
     default:
         ASSERT(!isSubtypeExposedToCSSOM());
         return TextCloneCSSValue::create(classType(), cssText());
     }
 }
 
 }