| Index: Source/core/css/CSSValuePool.cpp
|
| diff --git a/Source/core/css/CSSValuePool.cpp b/Source/core/css/CSSValuePool.cpp
|
| index a1c3183a69b4e3d6ff801f01427f1b80d377b400..ccf9f6ae9d7b58f86140067b92537d72ed13ab32 100644
|
| --- a/Source/core/css/CSSValuePool.cpp
|
| +++ b/Source/core/css/CSSValuePool.cpp
|
| @@ -53,7 +53,7 @@ CSSValuePool::CSSValuePool()
|
| m_numberValueCache.resize(maximumCacheableIntegerValue + 1);
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSValuePool::createIdentifierValue(CSSValueID ident)
|
| +PassRefPtr<CSSPrimitiveValue> CSSValuePool::createIdentifierValue(CSSValueID ident)
|
| {
|
| if (ident <= 0)
|
| return CSSPrimitiveValue::createIdentifier(ident);
|
| @@ -63,12 +63,12 @@ PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSValuePool::createIdentifierValue(CS
|
| return m_identifierValueCache[ident];
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSValuePool::createIdentifierValue(CSSPropertyID ident)
|
| +PassRefPtr<CSSPrimitiveValue> CSSValuePool::createIdentifierValue(CSSPropertyID ident)
|
| {
|
| return CSSPrimitiveValue::createIdentifier(ident);
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSValuePool::createColorValue(unsigned rgbValue)
|
| +PassRefPtr<CSSPrimitiveValue> CSSValuePool::createColorValue(unsigned rgbValue)
|
| {
|
| // These are the empty and deleted values of the hash table.
|
| if (rgbValue == Color::transparent)
|
| @@ -84,14 +84,14 @@ PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSValuePool::createColorValue(unsigne
|
| if (m_colorValueCache.size() > maximumColorCacheSize)
|
| m_colorValueCache.clear();
|
|
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> dummyValue = nullptr;
|
| + RefPtr<CSSPrimitiveValue> dummyValue = nullptr;
|
| ColorValueCache::AddResult entry = m_colorValueCache.add(rgbValue, dummyValue);
|
| if (entry.isNewEntry)
|
| entry.storedValue->value = CSSPrimitiveValue::createColor(rgbValue);
|
| return entry.storedValue->value;
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSValuePool::createValue(double value, CSSPrimitiveValue::UnitType type)
|
| +PassRefPtr<CSSPrimitiveValue> CSSValuePool::createValue(double value, CSSPrimitiveValue::UnitType type)
|
| {
|
| if (std::isinf(value))
|
| value = 0;
|
| @@ -121,29 +121,29 @@ PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSValuePool::createValue(double value
|
| }
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSValuePool::createValue(const Length& value, const ComputedStyle& style)
|
| +PassRefPtr<CSSPrimitiveValue> CSSValuePool::createValue(const Length& value, const ComputedStyle& style)
|
| {
|
| return CSSPrimitiveValue::create(value, style.effectiveZoom());
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSValuePool::createFontFamilyValue(const String& familyName)
|
| +PassRefPtr<CSSPrimitiveValue> CSSValuePool::createFontFamilyValue(const String& familyName)
|
| {
|
| - RefPtrWillBeMember<CSSPrimitiveValue>& value = m_fontFamilyValueCache.add(familyName, nullptr).storedValue->value;
|
| + RefPtr<CSSPrimitiveValue>& value = m_fontFamilyValueCache.add(familyName, nullptr).storedValue->value;
|
| if (!value)
|
| value = CSSPrimitiveValue::create(familyName, CSSPrimitiveValue::UnitType::CustomIdentifier);
|
| return value;
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<CSSValueList> CSSValuePool::createFontFaceValue(const AtomicString& string)
|
| +PassRefPtr<CSSValueList> CSSValuePool::createFontFaceValue(const AtomicString& string)
|
| {
|
| // Just wipe out the cache and start rebuilding if it gets too big.
|
| const unsigned maximumFontFaceCacheSize = 128;
|
| if (m_fontFaceValueCache.size() > maximumFontFaceCacheSize)
|
| m_fontFaceValueCache.clear();
|
|
|
| - RefPtrWillBeMember<CSSValueList>& value = m_fontFaceValueCache.add(string, nullptr).storedValue->value;
|
| + RefPtr<CSSValueList>& value = m_fontFaceValueCache.add(string, nullptr).storedValue->value;
|
| if (!value) {
|
| - RefPtrWillBeRawPtr<CSSValue> parsedValue = CSSParser::parseSingleValue(CSSPropertyFontFamily, string);
|
| + RefPtr<CSSValue> parsedValue = CSSParser::parseSingleValue(CSSPropertyFontFamily, string);
|
| if (parsedValue && parsedValue->isValueList())
|
| value = toCSSValueList(parsedValue.get());
|
| }
|
| @@ -153,18 +153,6 @@ PassRefPtrWillBeRawPtr<CSSValueList> CSSValuePool::createFontFaceValue(const Ato
|
| DEFINE_TRACE(CSSValuePool)
|
| {
|
| #if ENABLE(OILPAN)
|
| - visitor->trace(m_inheritedValue);
|
| - visitor->trace(m_implicitInitialValue);
|
| - visitor->trace(m_explicitInitialValue);
|
| - visitor->trace(m_unsetValue);
|
| - visitor->trace(m_identifierValueCache);
|
| - visitor->trace(m_colorValueCache);
|
| - visitor->trace(m_colorTransparent);
|
| - visitor->trace(m_colorWhite);
|
| - visitor->trace(m_colorBlack);
|
| - visitor->trace(m_pixelValueCache);
|
| - visitor->trace(m_percentValueCache);
|
| - visitor->trace(m_numberValueCache);
|
| visitor->trace(m_fontFaceValueCache);
|
| visitor->trace(m_fontFamilyValueCache);
|
| #endif
|
|
|