Index: Source/core/css/CSSPrimitiveValue.h |
diff --git a/Source/core/css/CSSPrimitiveValue.h b/Source/core/css/CSSPrimitiveValue.h |
index 0e5ac77d90ffb9f53bbec0f09f768fa05b3b64f6..82ec5bb81fe49ae2156f6c33dfd6e4a7fec8c3e6 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, |
QuirkyEms, |
@@ -157,7 +154,6 @@ public: |
|| type() == UnitType::Gradians |
|| type() == UnitType::Turns; |
} |
- bool isCustomIdent() const { return type() == UnitType::CustomIdentifier; } |
bool isFontRelativeLength() const |
{ |
return type() == UnitType::Ems |
@@ -178,9 +174,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; } |
@@ -208,10 +202,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)); |
@@ -252,7 +242,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; } |
@@ -284,7 +273,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 |
@@ -317,7 +305,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; |