Index: Source/core/css/CSSComputedStyleDeclaration.cpp |
diff --git a/Source/core/css/CSSComputedStyleDeclaration.cpp b/Source/core/css/CSSComputedStyleDeclaration.cpp |
index 564de0b2910aeb64e2a5055d8513f9f128d21ec9..eef3860e7c15ca95f4d7f1442bd2f92b537b6b0a 100644 |
--- a/Source/core/css/CSSComputedStyleDeclaration.cpp |
+++ b/Source/core/css/CSSComputedStyleDeclaration.cpp |
@@ -410,12 +410,12 @@ static CSSValueID cssIdentifierForFontSizeKeyword(int keywordSize) |
return static_cast<CSSValueID>(CSSValueXxSmall + keywordSize - 1); |
} |
-inline static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> zoomAdjustedPixelValue(double value, const ComputedStyle& style) |
+inline static PassRefPtr<CSSPrimitiveValue> zoomAdjustedPixelValue(double value, const ComputedStyle& style) |
{ |
return cssValuePool().createValue(adjustFloatForAbsoluteZoom(value, style), CSSPrimitiveValue::UnitType::Pixels); |
} |
-PassRefPtrWillBeRawPtr<CSSValue> CSSComputedStyleDeclaration::getFontSizeCSSValuePreferringKeyword() const |
+PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getFontSizeCSSValuePreferringKeyword() const |
{ |
if (!m_node) |
return nullptr; |
@@ -535,7 +535,7 @@ Node* CSSComputedStyleDeclaration::styledNode() const |
return m_node.get(); |
} |
-PassRefPtrWillBeRawPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropertyID propertyID) const |
+PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropertyID propertyID) const |
{ |
Node* styledNode = this->styledNode(); |
if (!styledNode) |
@@ -571,7 +571,7 @@ PassRefPtrWillBeRawPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValu |
if (!style) |
return nullptr; |
- RefPtrWillBeRawPtr<CSSValue> value = ComputedStyleCSSValueMapping::get(propertyID, *style, layoutObject, styledNode, m_allowVisitedStyle); |
+ RefPtr<CSSValue> value = ComputedStyleCSSValueMapping::get(propertyID, *style, layoutObject, styledNode, m_allowVisitedStyle); |
if (value) |
return value; |
@@ -581,7 +581,7 @@ PassRefPtrWillBeRawPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValu |
String CSSComputedStyleDeclaration::getPropertyValue(CSSPropertyID propertyID) const |
{ |
- RefPtrWillBeRawPtr<CSSValue> value = getPropertyCSSValue(propertyID); |
+ RefPtr<CSSValue> value = getPropertyCSSValue(propertyID); |
if (value) |
return value->cssText(); |
return ""; |
@@ -615,7 +615,7 @@ bool CSSComputedStyleDeclaration::cssPropertyMatches(CSSPropertyID propertyID, c |
return true; |
} |
} |
- RefPtrWillBeRawPtr<CSSValue> value = getPropertyCSSValue(propertyID); |
+ RefPtr<CSSValue> value = getPropertyCSSValue(propertyID); |
return value && propertyValue && value->equals(*propertyValue); |
} |
@@ -626,10 +626,10 @@ PassRefPtrWillBeRawPtr<MutableStylePropertySet> CSSComputedStyleDeclaration::cop |
PassRefPtrWillBeRawPtr<MutableStylePropertySet> CSSComputedStyleDeclaration::copyPropertiesInSet(const Vector<CSSPropertyID>& properties) const |
{ |
- WillBeHeapVector<CSSProperty, 256> list; |
+ Vector<CSSProperty, 256> list; |
list.reserveInitialCapacity(properties.size()); |
for (unsigned i = 0; i < properties.size(); ++i) { |
- RefPtrWillBeRawPtr<CSSValue> value = getPropertyCSSValue(properties[i]); |
+ RefPtr<CSSValue> value = getPropertyCSSValue(properties[i]); |
if (value) |
list.append(CSSProperty(properties[i], value.release(), false)); |
} |
@@ -677,7 +677,7 @@ String CSSComputedStyleDeclaration::removeProperty(const String& name, Exception |
return String(); |
} |
-PassRefPtrWillBeRawPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValueInternal(CSSPropertyID propertyID) |
+PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValueInternal(CSSPropertyID propertyID) |
{ |
return getPropertyCSSValue(propertyID); |
} |