Change Rect and Quad to be CSSValues

Source/core/css/CSSPrimitiveValue.cpp

Index: Source/core/css/CSSPrimitiveValue.cpp
diff --git a/Source/core/css/CSSPrimitiveValue.cpp b/Source/core/css/CSSPrimitiveValue.cpp
index 749f4b658af36df3d3261f5a16dde9b8eb2983bd..4e6fd86d2e57a68662bf83133937a91a13daa7e8 100644
--- a/Source/core/css/CSSPrimitiveValue.cpp
+++ b/Source/core/css/CSSPrimitiveValue.cpp
@@ -27,7 +27,6 @@
 #include "core/css/CSSMarkup.h"
 #include "core/css/CSSToLengthConversionData.h"
 #include "core/css/Pair.h"
-#include "core/css/Rect.h"
 #include "core/css/StyleSheetContents.h"
 #include "core/dom/Node.h"
 #include "core/style/ComputedStyle.h"
@@ -334,20 +333,6 @@ void CSSPrimitiveValue::init(const LengthSize& lengthSize, const ComputedStyle&
     m_value.pair = Pair::create(create(lengthSize.width(), style.effectiveZoom()), create(lengthSize.height(), style.effectiveZoom()), Pair::KeepIdenticalValues).leakRef();
 }
 
-void CSSPrimitiveValue::init(PassRefPtrWillBeRawPtr<Rect> r)
-{
-    init(UnitType::Rect);
-    m_hasCachedCSSText = false;
-    m_value.rect = r.leakRef();
-}
-
-void CSSPrimitiveValue::init(PassRefPtrWillBeRawPtr<Quad> quad)
-{
-    init(UnitType::Quad);
-    m_hasCachedCSSText = false;
-    m_value.quad = quad.leakRef();
-}
-
 void CSSPrimitiveValue::init(PassRefPtrWillBeRawPtr<Pair> p)
 {
     init(UnitType::Pair);
@@ -384,18 +369,6 @@ void CSSPrimitiveValue::cleanup()
         if (m_value.string)
             m_value.string->deref();
         break;
-    case UnitType::Rect:
-        // We must not call deref() when oilpan is enabled because m_value.rect is traced.
-#if !ENABLE(OILPAN)
-        m_value.rect->deref();
-#endif
-        break;
-    case UnitType::Quad:
-        // We must not call deref() when oilpan is enabled because m_value.quad is traced.
-#if !ENABLE(OILPAN)
-        m_value.quad->deref();
-#endif
-        break;
     case UnitType::Pair:
         // We must not call deref() when oilpan is enabled because m_value.pair is traced.
 #if !ENABLE(OILPAN)
@@ -893,8 +866,6 @@ const char* CSSPrimitiveValue::unitTypeToString(UnitType type)
     case UnitType::ValueID:
     case UnitType::PropertyID:
     case UnitType::Attribute:
-    case UnitType::Rect:
-    case UnitType::Quad:
     case UnitType::RGBColor:
     case UnitType::Pair:
     case UnitType::Calc:
@@ -965,10 +936,6 @@ String CSSPrimitiveValue::customCSSText() const
 
         return result.toString();
     }
-    case UnitType::Rect:
-        return getRectValue()->cssText();
-    case UnitType::Quad:
-        return getQuadValue()->cssText();
     case UnitType::RGBColor: {
         return Color(m_value.rgbcolor).serializedAsCSSComponentValue();
     }
@@ -1031,10 +998,6 @@ bool CSSPrimitiveValue::equals(const CSSPrimitiveValue& other) const
     case UnitType::URI:
     case UnitType::Attribute:
         return equal(m_value.string, other.m_value.string);
-    case UnitType::Rect:
-        return m_value.rect && other.m_value.rect && m_value.rect->equals(*other.m_value.rect);
-    case UnitType::Quad:
-        return m_value.quad && other.m_value.quad && m_value.quad->equals(*other.m_value.quad);
     case UnitType::RGBColor:
         return m_value.rgbcolor == other.m_value.rgbcolor;
     case UnitType::Pair:
@@ -1057,12 +1020,6 @@ DEFINE_TRACE_AFTER_DISPATCH(CSSPrimitiveValue)
 {
 #if ENABLE(OILPAN)
     switch (type()) {
-    case UnitType::Rect:
-        visitor->trace(m_value.rect);
-        break;
-    case UnitType::Quad:
-        visitor->trace(m_value.quad);
-        break;
     case UnitType::Pair:
         visitor->trace(m_value.pair);
         break;