Change Rect and Quad to be CSSValues

Source/core/css/CSSPrimitiveValue.h

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 23 matching lines @@
 #include "wtf/text/StringHash.h"
 
 namespace blink {
 
 class CSSBasicShape;
 class CSSCalcValue;
 class CSSToLengthConversionData;
 class Length;
 class LengthSize;
 class Pair;
-class Quad;
 class RGBColor;
-class Rect;
 class ComputedStyle;
 
 // Dimension calculations are imprecise, often resulting in values of e.g.
 // 44.99998. We need to go ahead and round if we're really close to the next
 // integer value.
 template<typename T> inline T roundForImpreciseConversion(double value)
 {
     value += (value < 0) ? -0.01 : +0.01;
     return ((value > std::numeric_limits<T>::max()) || (value < std::numeric_limits<T>::min())) ? 0 : static_cast<T>(value);
 }
@@ skipping 30 matching lines @@
         Radians,
         Gradians,
         Turns,
         Milliseconds,
         Seconds,
         Hertz,
         Kilohertz,
         CustomIdentifier,
         URI,
         Attribute,
-        Rect,
         RGBColor,
         ViewportWidth,
         ViewportHeight,
         ViewportMin,
         ViewportMax,
         DotsPerPixel,
         DotsPerInch,
         DotsPerCentimeter,
         Fraction,
         Integer,
         Pair,
         Rems,
         Chs,
         Shape,
-        Quad,
         Calc,
         CalcPercentageWithNumber,
         CalcPercentageWithLength,
         String,
         PropertyID,
         ValueID,
         QuirkyEms,
     };
 
     enum LengthUnitType {
@@ skipping 55 matching lines @@
     static bool isViewportPercentageLength(UnitType type) { return type >= UnitType::ViewportWidth && type <= UnitType::ViewportMax; }
     static bool isLength(UnitType type)
     {
         return (type >= UnitType::Ems && type <= UnitType::Picas) || type == UnitType::Rems || type == UnitType::Chs || isViewportPercentageLength(type);
     }
     bool isLength() const { return isLength(typeWithCalcResolved()); }
     bool isNumber() const { return typeWithCalcResolved() == UnitType::Number || typeWithCalcResolved() == UnitType::Integer; }
     bool isPercentage() const { return typeWithCalcResolved() == UnitType::Percentage; }
     bool isPropertyID() const { return type() == UnitType::PropertyID; }
     bool isPx() const { return typeWithCalcResolved() == UnitType::Pixels; }
-    bool isQuad() const { return type() == UnitType::Quad; }
-    bool isRect() const { return type() == UnitType::Rect; }
     bool isRGBColor() const { return type() == UnitType::RGBColor; }
     bool isShape() const { return type() == UnitType::Shape; }
     bool isString() const { return type() == UnitType::String; }
     bool isTime() const { return type() == UnitType::Seconds || type() == UnitType::Milliseconds; }
     bool isURI() const { return type() == UnitType::URI; }
     bool isCalculated() const { return type() == UnitType::Calc; }
     bool isCalculatedPercentageWithNumber() const { return typeWithCalcResolved() == UnitType::CalcPercentageWithNumber; }
     bool isCalculatedPercentageWithLength() const { return typeWithCalcResolved() == UnitType::CalcPercentageWithLength; }
     static bool isDotsPerInch(UnitType type) { return type == UnitType::DotsPerInch; }
     static bool isDotsPerPixel(UnitType type) { return type == UnitType::DotsPerPixel; }
@@ skipping 61 matching lines @@
 
     // Converts to a Length (Fixed, Percent or Calculated)
     Length convertToLength(const CSSToLengthConversionData&);
 
     double getDoubleValue() const;
     float getFloatValue() const { return getValue<float>(); }
     int getIntValue() const { return getValue<int>(); }
     template<typename T> inline T getValue() const { return clampTo<T>(getDoubleValue()); }
 
     String getStringValue() const;
-
-    Rect* getRectValue() const { ASSERT(isRect()); return m_value.rect; }
-    Quad* getQuadValue() const { ASSERT(isQuad()); return m_value.quad; }
     RGBA32 getRGBA32Value() const { ASSERT(isRGBColor()); return m_value.rgbcolor; }
 
     // TODO(timloh): Add isPair() and update callers so we can ASSERT(isPair())
     Pair* getPairValue() const { return type() != UnitType::Pair ? 0 : m_value.pair; }
 
     CSSBasicShape* getShapeValue() const { ASSERT(isShape()); return m_value.shape; }
     CSSCalcValue* cssCalcValue() const { ASSERT(isCalculated()); return m_value.calc; }
     CSSPropertyID getPropertyID() const { ASSERT(isPropertyID()); return m_value.propertyID; }
 
     CSSValueID getValueID() const { return type() == UnitType::ValueID ? m_value.valueID : CSSValueInvalid; }
@@ skipping 38 matching lines @@
         init(val);
     }
 
     static void create(int); // compile-time guard
     static void create(unsigned); // compile-time guard
     template<typename T> operator T*(); // compile-time guard
 
     void init(UnitType);
     void init(const Length&);
     void init(const LengthSize&, const ComputedStyle&);
-    void init(PassRefPtrWillBeRawPtr<Rect>);
     void init(PassRefPtrWillBeRawPtr<Pair>);
-    void init(PassRefPtrWillBeRawPtr<Quad>);
     void init(PassRefPtrWillBeRawPtr<CSSBasicShape>);
     void init(PassRefPtrWillBeRawPtr<CSSCalcValue>);
 
     double computeLengthDouble(const CSSToLengthConversionData&);
 
     inline UnitType type() const { return static_cast<UnitType>(m_primitiveUnitType); }
 
     union {
         CSSPropertyID propertyID;
         CSSValueID valueID;
         double num;
         StringImpl* string;
         RGBA32 rgbcolor;
         // FIXME: oilpan: Should be members, but no support for members in unions. Just trace the raw ptr for now.
         CSSBasicShape* shape;
         CSSCalcValue* calc;
         Pair* pair;
-        Rect* rect;
-        Quad* quad;
     } m_value;
 };
 
 typedef CSSPrimitiveValue::CSSLengthArray CSSLengthArray;
 typedef CSSPrimitiveValue::CSSLengthTypeArray CSSLengthTypeArray;
 
 DEFINE_CSS_VALUE_TYPE_CASTS(CSSPrimitiveValue, isPrimitiveValue());
 
 } // namespace blink
 
 #endif // CSSPrimitiveValue_h