Index: Source/core/css/CSSValuePool.h |
diff --git a/Source/core/css/CSSValuePool.h b/Source/core/css/CSSValuePool.h |
index c6c4317a62cfdf10a52790ef4d1e6e84dd75bec4..5ea19162439cb030995da01a0c218fc29b2d0e50 100644 |
--- a/Source/core/css/CSSValuePool.h |
+++ b/Source/core/css/CSSValuePool.h |
@@ -32,6 +32,7 @@ |
#include "core/css/CSSInheritedValue.h" |
#include "core/css/CSSInitialValue.h" |
#include "core/css/CSSPrimitiveValue.h" |
+#include "core/css/CSSStringValue.h" |
#include "core/css/CSSUnsetValue.h" |
#include "core/css/CSSValueList.h" |
#include "wtf/HashMap.h" |
@@ -44,7 +45,7 @@ class CORE_EXPORT CSSValuePool : public NoBaseWillBeGarbageCollectedFinalized<C |
WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(CSSValuePool); |
public: |
PassRefPtrWillBeRawPtr<CSSValueList> createFontFaceValue(const AtomicString&); |
- PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createFontFamilyValue(const String&); |
+ PassRefPtrWillBeRawPtr<CSSIdentValue> createFontFamilyValue(const String&); |
PassRefPtrWillBeRawPtr<CSSInheritedValue> createInheritedValue() { return m_inheritedValue; } |
PassRefPtrWillBeRawPtr<CSSInitialValue> createImplicitInitialValue() { return m_implicitInitialValue; } |
PassRefPtrWillBeRawPtr<CSSInitialValue> createExplicitInitialValue() { return m_explicitInitialValue; } |
@@ -53,7 +54,6 @@ public: |
PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createIdentifierValue(CSSPropertyID identifier); |
PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createColorValue(unsigned rgbValue); |
PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createValue(double value, CSSPrimitiveValue::UnitType); |
- PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createValue(const String& value, CSSPrimitiveValue::UnitType type) { return CSSPrimitiveValue::create(value, type); } |
PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createValue(const Length& value, const ComputedStyle&); |
PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createValue(const Length& value, float zoom) { return CSSPrimitiveValue::create(value, zoom); } |
template<typename T> static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createValue(T value) { return CSSPrimitiveValue::create(value); } |
@@ -85,7 +85,7 @@ private: |
typedef WillBeHeapHashMap<AtomicString, RefPtrWillBeMember<CSSValueList>> FontFaceValueCache; |
FontFaceValueCache m_fontFaceValueCache; |
- typedef WillBeHeapHashMap<String, RefPtrWillBeMember<CSSPrimitiveValue>> FontFamilyValueCache; |
+ typedef WillBeHeapHashMap<String, RefPtrWillBeMember<CSSIdentValue>> FontFamilyValueCache; |
FontFamilyValueCache m_fontFamilyValueCache; |
friend CORE_EXPORT CSSValuePool& cssValuePool(); |