Index: Source/core/css/CSSPrimitiveValue.h |
diff --git a/Source/core/css/CSSPrimitiveValue.h b/Source/core/css/CSSPrimitiveValue.h |
index 1820b226d24c511e3c90c80db830cb3cfecda590..cee8b13ffe1ea7fbbc6f37c4666ad6b705bbe77a 100644 |
--- a/Source/core/css/CSSPrimitiveValue.h |
+++ b/Source/core/css/CSSPrimitiveValue.h |
@@ -223,7 +223,7 @@ public: |
bool isValueID() const { return type() == CSS_VALUE_ID; } |
bool colorIsDerivedFromElement() const; |
- static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createIdentifier(CSSValueID valueID) |
+ static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> create(CSSValueID valueID) |
{ |
CSSTaggedPtrValue taggedPtr; |
taggedPtr.flag = 1; |
@@ -231,7 +231,7 @@ public: |
taggedPtr.value = static_cast<uintptr_t>(valueID); |
return adoptRefWillBeNoop(toPtr(taggedPtr)); |
} |
- static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createIdentifier(CSSPropertyID propertyID) |
+ static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> create(CSSPropertyID propertyID) |
{ |
CSSTaggedPtrValue taggedPtr; |
taggedPtr.flag = 1; |
@@ -290,9 +290,20 @@ public: |
{ |
return adoptRefWillBeNoop(new CSSPrimitiveValue(value, style)); |
} |
- template<typename T> static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> create(T value) |
+ template<typename T> static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> create(T value); // Defined in CSSPrimitiveValueMappings.h |
+ |
+ template<typename T> static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> create(T* val) |
+ { |
+ CSSPrimitiveValue* primitiveValue = new CSSPrimitiveValue(CSS_UNKNOWN); |
+ primitiveValue->init(PassRefPtrWillBeRawPtr<T>(val)); |
+ return adoptRefWillBeNoop(primitiveValue); |
+ } |
+ |
+ template<typename T> static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> create(PassRefPtrWillBeRawPtr<T> val) |
{ |
- return adoptRefWillBeNoop(new CSSPrimitiveValue(value)); |
+ CSSPrimitiveValue* primitiveValue = new CSSPrimitiveValue(CSS_UNKNOWN); |
+ primitiveValue->init(val); |
+ return adoptRefWillBeNoop(primitiveValue); |
} |
// This value is used to handle quirky margins in reflow roots (body, td, and th) like WinIE. |
@@ -385,7 +396,6 @@ private: |
CSSPrimitiveValue(const String&, UnitType); |
CSSPrimitiveValue(double, UnitType); |
- template<typename T> CSSPrimitiveValue(T); // Defined in CSSPrimitiveValueMappings.h |
template<typename T> CSSPrimitiveValue(T* val) |
: CSSValue(PrimitiveClass) |
{ |