Index: Source/core/css/CSSValuePool.h |
diff --git a/Source/core/css/CSSValuePool.h b/Source/core/css/CSSValuePool.h |
index c6c4317a62cfdf10a52790ef4d1e6e84dd75bec4..95b296f6e5eccd0f3bd28a4e48d70a56b2d08bdc 100644 |
--- a/Source/core/css/CSSValuePool.h |
+++ b/Source/core/css/CSSValuePool.h |
@@ -43,49 +43,49 @@ namespace blink { |
class CORE_EXPORT CSSValuePool : public NoBaseWillBeGarbageCollectedFinalized<CSSValuePool> { |
WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(CSSValuePool); |
public: |
- PassRefPtrWillBeRawPtr<CSSValueList> createFontFaceValue(const AtomicString&); |
- PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createFontFamilyValue(const String&); |
- PassRefPtrWillBeRawPtr<CSSInheritedValue> createInheritedValue() { return m_inheritedValue; } |
- PassRefPtrWillBeRawPtr<CSSInitialValue> createImplicitInitialValue() { return m_implicitInitialValue; } |
- PassRefPtrWillBeRawPtr<CSSInitialValue> createExplicitInitialValue() { return m_explicitInitialValue; } |
- PassRefPtrWillBeRawPtr<CSSUnsetValue> createUnsetValue() { return m_unsetValue; } |
- PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createIdentifierValue(CSSValueID identifier); |
- 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); } |
+ PassRefPtr<CSSValueList> createFontFaceValue(const AtomicString&); |
+ PassRefPtr<CSSPrimitiveValue> createFontFamilyValue(const String&); |
+ PassRefPtr<CSSInheritedValue> createInheritedValue() { return m_inheritedValue; } |
+ PassRefPtr<CSSInitialValue> createImplicitInitialValue() { return m_implicitInitialValue; } |
+ PassRefPtr<CSSInitialValue> createExplicitInitialValue() { return m_explicitInitialValue; } |
+ PassRefPtr<CSSUnsetValue> createUnsetValue() { return m_unsetValue; } |
+ PassRefPtr<CSSPrimitiveValue> createIdentifierValue(CSSValueID identifier); |
+ PassRefPtr<CSSPrimitiveValue> createIdentifierValue(CSSPropertyID identifier); |
+ PassRefPtr<CSSPrimitiveValue> createColorValue(unsigned rgbValue); |
+ PassRefPtr<CSSPrimitiveValue> createValue(double value, CSSPrimitiveValue::UnitType); |
+ PassRefPtr<CSSPrimitiveValue> createValue(const String& value, CSSPrimitiveValue::UnitType type) { return CSSPrimitiveValue::create(value, type); } |
+ PassRefPtr<CSSPrimitiveValue> createValue(const Length& value, const ComputedStyle&); |
+ PassRefPtr<CSSPrimitiveValue> createValue(const Length& value, float zoom) { return CSSPrimitiveValue::create(value, zoom); } |
+ template<typename T> static PassRefPtr<CSSPrimitiveValue> createValue(T value) { return CSSPrimitiveValue::create(value); } |
DECLARE_TRACE(); |
private: |
CSSValuePool(); |
- RefPtrWillBeMember<CSSInheritedValue> m_inheritedValue; |
- RefPtrWillBeMember<CSSInitialValue> m_implicitInitialValue; |
- RefPtrWillBeMember<CSSInitialValue> m_explicitInitialValue; |
- RefPtrWillBeMember<CSSUnsetValue> m_unsetValue; |
+ RefPtr<CSSInheritedValue> m_inheritedValue; |
+ RefPtr<CSSInitialValue> m_implicitInitialValue; |
+ RefPtr<CSSInitialValue> m_explicitInitialValue; |
+ RefPtr<CSSUnsetValue> m_unsetValue; |
- WillBeHeapVector<RefPtrWillBeMember<CSSPrimitiveValue>, numCSSValueKeywords> m_identifierValueCache; |
+ Vector<RefPtr<CSSPrimitiveValue>, numCSSValueKeywords> m_identifierValueCache; |
- typedef WillBeHeapHashMap<unsigned, RefPtrWillBeMember<CSSPrimitiveValue>> ColorValueCache; |
+ typedef HashMap<unsigned, RefPtr<CSSPrimitiveValue>> ColorValueCache; |
ColorValueCache m_colorValueCache; |
- RefPtrWillBeMember<CSSPrimitiveValue> m_colorTransparent; |
- RefPtrWillBeMember<CSSPrimitiveValue> m_colorWhite; |
- RefPtrWillBeMember<CSSPrimitiveValue> m_colorBlack; |
+ RefPtr<CSSPrimitiveValue> m_colorTransparent; |
+ RefPtr<CSSPrimitiveValue> m_colorWhite; |
+ RefPtr<CSSPrimitiveValue> m_colorBlack; |
static const int maximumCacheableIntegerValue = 255; |
- WillBeHeapVector<RefPtrWillBeMember<CSSPrimitiveValue>, maximumCacheableIntegerValue + 1> m_pixelValueCache; |
- WillBeHeapVector<RefPtrWillBeMember<CSSPrimitiveValue>, maximumCacheableIntegerValue + 1> m_percentValueCache; |
- WillBeHeapVector<RefPtrWillBeMember<CSSPrimitiveValue>, maximumCacheableIntegerValue + 1> m_numberValueCache; |
+ Vector<RefPtr<CSSPrimitiveValue>, maximumCacheableIntegerValue + 1> m_pixelValueCache; |
+ Vector<RefPtr<CSSPrimitiveValue>, maximumCacheableIntegerValue + 1> m_percentValueCache; |
+ Vector<RefPtr<CSSPrimitiveValue>, maximumCacheableIntegerValue + 1> m_numberValueCache; |
- typedef WillBeHeapHashMap<AtomicString, RefPtrWillBeMember<CSSValueList>> FontFaceValueCache; |
+ typedef WillBeHeapHashMap<AtomicString, RefPtr<CSSValueList>> FontFaceValueCache; |
FontFaceValueCache m_fontFaceValueCache; |
- typedef WillBeHeapHashMap<String, RefPtrWillBeMember<CSSPrimitiveValue>> FontFamilyValueCache; |
+ typedef WillBeHeapHashMap<String, RefPtr<CSSPrimitiveValue>> FontFamilyValueCache; |
FontFamilyValueCache m_fontFamilyValueCache; |
friend CORE_EXPORT CSSValuePool& cssValuePool(); |