Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(172)

Unified Diff: third_party/WebKit/Source/core/css/CSSPrimitiveValue.h

Issue 1373433002: Split out CSSPrimitiveValue's PropertyID into CSSCustomIdentValue (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@split_string
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/css/CSSPrimitiveValue.h
diff --git a/third_party/WebKit/Source/core/css/CSSPrimitiveValue.h b/third_party/WebKit/Source/core/css/CSSPrimitiveValue.h
index 92984c05fb6bdfde840c7a850cda100e0ca3af45..44f2b254ba1682c1038f5379a73f1736a4541317 100644
--- a/third_party/WebKit/Source/core/css/CSSPrimitiveValue.h
+++ b/third_party/WebKit/Source/core/css/CSSPrimitiveValue.h
@@ -101,7 +101,6 @@ public:
Calc,
CalcPercentageWithNumber,
CalcPercentageWithLength,
- PropertyID,
ValueID,
// This value is used to handle quirky margins in reflow roots (body, td, and th) like WinIE.
@@ -176,7 +175,6 @@ public:
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 isRGBColor() const { return type() == UnitType::RGBColor; }
bool isTime() const { return type() == UnitType::Seconds || type() == UnitType::Milliseconds; }
@@ -195,10 +193,6 @@ public:
{
return adoptRefWillBeNoop(new CSSPrimitiveValue(valueID));
}
- static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createIdentifier(CSSPropertyID propertyID)
- {
- return adoptRefWillBeNoop(new CSSPrimitiveValue(propertyID));
- }
static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createColor(RGBA32 rgbValue)
{
return adoptRefWillBeNoop(new CSSPrimitiveValue(rgbValue));
@@ -239,7 +233,6 @@ public:
RGBA32 getRGBA32Value() const { ASSERT(isRGBColor()); return m_value.rgbcolor; }
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; }
@@ -261,7 +254,6 @@ public:
private:
CSSPrimitiveValue(CSSValueID);
- CSSPrimitiveValue(CSSPropertyID);
CSSPrimitiveValue(RGBA32 color);
CSSPrimitiveValue(const Length&, float zoom);
CSSPrimitiveValue(double, UnitType);
@@ -292,7 +284,6 @@ private:
inline UnitType type() const { return static_cast<UnitType>(m_primitiveUnitType); }
union {
- CSSPropertyID propertyID;
CSSValueID valueID;
double num;
RGBA32 rgbcolor;

Powered by Google App Engine
This is Rietveld 408576698