Index: Source/core/css/CSSPrimitiveValue.h |
diff --git a/Source/core/css/CSSPrimitiveValue.h b/Source/core/css/CSSPrimitiveValue.h |
index a8ddb5e8302e488fdbc85d98e11de1af96b2f93a..b63ba2f709283951ea877ce3dceca9c95d180132 100644 |
--- a/Source/core/css/CSSPrimitiveValue.h |
+++ b/Source/core/css/CSSPrimitiveValue.h |
@@ -89,7 +89,7 @@ public: |
CSS_S = 15, |
CSS_HZ = 16, |
CSS_KHZ = 17, |
- CSS_STRING = 19, |
+ CSS_CUSTOM_IDENT = 19, |
CSS_URI = 20, |
CSS_IDENT = 21, |
CSS_ATTR = 22, |
@@ -126,6 +126,8 @@ public: |
CSS_CALC_PERCENTAGE_WITH_NUMBER = 114, |
CSS_CALC_PERCENTAGE_WITH_LENGTH = 115, |
+ CSS_STRING = 116, |
+ |
CSS_PROPERTY_ID = 117, |
CSS_VALUE_ID = 118 |
}; |
@@ -199,7 +201,7 @@ public: |
bool isRect() const { return m_primitiveUnitType == CSS_RECT; } |
bool isRGBColor() const { return m_primitiveUnitType == CSS_RGBCOLOR; } |
bool isShape() const { return m_primitiveUnitType == CSS_SHAPE; } |
- bool isString() const { return m_primitiveUnitType == CSS_STRING; } |
+ bool isString() const { return m_primitiveUnitType == CSS_CUSTOM_IDENT || m_primitiveUnitType == CSS_STRING; } |
bool isTime() const { return m_primitiveUnitType == CSS_S || m_primitiveUnitType == CSS_MS; } |
bool isURI() const { return m_primitiveUnitType == CSS_URI; } |
bool isCalculated() const { return m_primitiveUnitType == CSS_CALC; } |
@@ -314,7 +316,7 @@ public: |
template<typename T> inline operator T() const; // Defined in CSSPrimitiveValueMappings.h |
static const char* unitTypeToString(UnitType); |
- String customCSSText(CSSTextFormattingFlags = QuoteCSSStringIfNeeded) const; |
+ String customCSSText() const; |
bool isQuirkValue() { return m_isQuirkValue; } |