| Index: Source/core/css/CSSPrimitiveValue.h
|
| diff --git a/Source/core/css/CSSPrimitiveValue.h b/Source/core/css/CSSPrimitiveValue.h
|
| index d7f09dfddd207632a66e45771608e08c0c27ad14..9b58b2ee9dda94fb626fa597b4aa3644c04e4a8b 100644
|
| --- a/Source/core/css/CSSPrimitiveValue.h
|
| +++ b/Source/core/css/CSSPrimitiveValue.h
|
| @@ -87,8 +87,6 @@ public:
|
| Seconds,
|
| Hertz,
|
| Kilohertz,
|
| - CustomIdentifier,
|
| - URI,
|
| RGBColor,
|
| ViewportWidth,
|
| ViewportHeight,
|
| @@ -105,7 +103,6 @@ public:
|
| Calc,
|
| CalcPercentageWithNumber,
|
| CalcPercentageWithLength,
|
| - String,
|
| PropertyID,
|
| ValueID,
|
|
|
| @@ -163,7 +160,6 @@ public:
|
| || type() == UnitType::Gradians
|
| || type() == UnitType::Turns;
|
| }
|
| - bool isCustomIdent() const { return type() == UnitType::CustomIdentifier; }
|
| bool isFontRelativeLength() const
|
| {
|
| return type() == UnitType::QuirkyEms
|
| @@ -186,9 +182,7 @@ public:
|
| bool isPx() const { return typeWithCalcResolved() == UnitType::Pixels; }
|
| 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; }
|
| @@ -216,10 +210,6 @@ public:
|
| {
|
| return adoptRefWillBeNoop(new CSSPrimitiveValue(value, type));
|
| }
|
| - static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> create(const String& value, UnitType type)
|
| - {
|
| - return adoptRefWillBeNoop(new CSSPrimitiveValue(value, type));
|
| - }
|
| static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> create(const Length& value, float zoom)
|
| {
|
| return adoptRefWillBeNoop(new CSSPrimitiveValue(value, zoom));
|
| @@ -249,7 +239,6 @@ public:
|
| int getIntValue() const { return getValue<int>(); }
|
| template<typename T> inline T getValue() const { return clampTo<T>(getDoubleValue()); }
|
|
|
| - String getStringValue() const;
|
| RGBA32 getRGBA32Value() const { ASSERT(isRGBColor()); return m_value.rgbcolor; }
|
|
|
| CSSBasicShape* getShapeValue() const { ASSERT(isShape()); return m_value.shape; }
|
| @@ -279,7 +268,6 @@ private:
|
| CSSPrimitiveValue(CSSPropertyID);
|
| CSSPrimitiveValue(RGBA32 color);
|
| CSSPrimitiveValue(const Length&, float zoom);
|
| - CSSPrimitiveValue(const String&, UnitType);
|
| CSSPrimitiveValue(double, UnitType);
|
|
|
| template<typename T> CSSPrimitiveValue(T); // Defined in CSSPrimitiveValueMappings.h
|
| @@ -312,7 +300,6 @@ private:
|
| 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;
|
|
|