| Index: third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.cpp
|
| diff --git a/third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.cpp b/third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.cpp
|
| index 0c3dda6c8401ab771c079841d111cfb583c0b6a5..c608a564590cd80f6e0974e798332ad88de2bac5 100644
|
| --- a/third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.cpp
|
| +++ b/third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.cpp
|
| @@ -352,7 +352,7 @@ static const Vector<CSSPropertyID>& computableProperties()
|
| return properties;
|
| }
|
|
|
| -CSSComputedStyleDeclaration::CSSComputedStyleDeclaration(PassRefPtrWillBeRawPtr<Node> n, bool allowVisitedStyle, const String& pseudoElementName)
|
| +CSSComputedStyleDeclaration::CSSComputedStyleDeclaration(RawPtr<Node> n, bool allowVisitedStyle, const String& pseudoElementName)
|
| : m_node(n)
|
| , m_allowVisitedStyle(allowVisitedStyle)
|
| #if !ENABLE(OILPAN)
|
| @@ -411,12 +411,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 RawPtr<CSSPrimitiveValue> zoomAdjustedPixelValue(double value, const ComputedStyle& style)
|
| {
|
| return cssValuePool().createValue(adjustFloatForAbsoluteZoom(value, style), CSSPrimitiveValue::UnitType::Pixels);
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<CSSValue> CSSComputedStyleDeclaration::getFontSizeCSSValuePreferringKeyword() const
|
| +RawPtr<CSSValue> CSSComputedStyleDeclaration::getFontSizeCSSValuePreferringKeyword() const
|
| {
|
| if (!m_node)
|
| return nullptr;
|
| @@ -529,7 +529,7 @@ Node* CSSComputedStyleDeclaration::styledNode() const
|
| return m_node.get();
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(AtomicString customPropertyName) const
|
| +RawPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(AtomicString customPropertyName) const
|
| {
|
| const ComputedStyle* style = computeComputedStyle();
|
| if (!style)
|
| @@ -545,7 +545,7 @@ const HashMap<AtomicString, RefPtr<CSSVariableData>>* CSSComputedStyleDeclaratio
|
| return ComputedStyleCSSValueMapping::getVariables(*style);
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropertyID propertyID) const
|
| +RawPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropertyID propertyID) const
|
| {
|
| Node* styledNode = this->styledNode();
|
| if (!styledNode)
|
| @@ -578,7 +578,7 @@ PassRefPtrWillBeRawPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValu
|
| if (!style)
|
| return nullptr;
|
|
|
| - RefPtrWillBeRawPtr<CSSValue> value = ComputedStyleCSSValueMapping::get(propertyID, *style, layoutObject, styledNode, m_allowVisitedStyle);
|
| + RawPtr<CSSValue> value = ComputedStyleCSSValueMapping::get(propertyID, *style, layoutObject, styledNode, m_allowVisitedStyle);
|
| if (value)
|
| return value;
|
|
|
| @@ -588,7 +588,7 @@ PassRefPtrWillBeRawPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValu
|
|
|
| String CSSComputedStyleDeclaration::getPropertyValue(CSSPropertyID propertyID) const
|
| {
|
| - RefPtrWillBeRawPtr<CSSValue> value = getPropertyCSSValue(propertyID);
|
| + RawPtr<CSSValue> value = getPropertyCSSValue(propertyID);
|
| if (value)
|
| return value->cssText();
|
| return "";
|
| @@ -622,21 +622,21 @@ bool CSSComputedStyleDeclaration::cssPropertyMatches(CSSPropertyID propertyID, c
|
| return true;
|
| }
|
| }
|
| - RefPtrWillBeRawPtr<CSSValue> value = getPropertyCSSValue(propertyID);
|
| + RawPtr<CSSValue> value = getPropertyCSSValue(propertyID);
|
| return value && propertyValue && value->equals(*propertyValue);
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<MutableStylePropertySet> CSSComputedStyleDeclaration::copyProperties() const
|
| +RawPtr<MutableStylePropertySet> CSSComputedStyleDeclaration::copyProperties() const
|
| {
|
| return copyPropertiesInSet(computableProperties());
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<MutableStylePropertySet> CSSComputedStyleDeclaration::copyPropertiesInSet(const Vector<CSSPropertyID>& properties) const
|
| +RawPtr<MutableStylePropertySet> CSSComputedStyleDeclaration::copyPropertiesInSet(const Vector<CSSPropertyID>& properties) const
|
| {
|
| - WillBeHeapVector<CSSProperty, 256> list;
|
| + HeapVector<CSSProperty, 256> list;
|
| list.reserveInitialCapacity(properties.size());
|
| for (unsigned i = 0; i < properties.size(); ++i) {
|
| - RefPtrWillBeRawPtr<CSSValue> value = getPropertyCSSValue(properties[i]);
|
| + RawPtr<CSSValue> value = getPropertyCSSValue(properties[i]);
|
| if (value)
|
| list.append(CSSProperty(properties[i], value.release(), false));
|
| }
|
| @@ -653,7 +653,7 @@ String CSSComputedStyleDeclaration::getPropertyValue(const String& propertyName)
|
| CSSPropertyID propertyID = cssPropertyID(propertyName);
|
| if (!propertyID) {
|
| if (RuntimeEnabledFeatures::cssVariablesEnabled() && CSSVariableParser::isValidVariableName(propertyName)) {
|
| - RefPtrWillBeRawPtr<CSSValue> value = getPropertyCSSValue(AtomicString(propertyName));
|
| + RawPtr<CSSValue> value = getPropertyCSSValue(AtomicString(propertyName));
|
| if (value)
|
| return value->cssText();
|
| }
|
| @@ -690,7 +690,7 @@ String CSSComputedStyleDeclaration::removeProperty(const String& name, Exception
|
| return String();
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValueInternal(CSSPropertyID propertyID)
|
| +RawPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValueInternal(CSSPropertyID propertyID)
|
| {
|
| return getPropertyCSSValue(propertyID);
|
| }
|
|
|