| Index: Source/core/css/resolver/ViewportStyleResolver.cpp
|
| diff --git a/Source/core/css/resolver/ViewportStyleResolver.cpp b/Source/core/css/resolver/ViewportStyleResolver.cpp
|
| index 5d47d3a59ca32111d1fb2d7d19d27f2659950e8f..23f0dae69ac0ee309a4f8fbb106fe1a4c1cb2665 100644
|
| --- a/Source/core/css/resolver/ViewportStyleResolver.cpp
|
| +++ b/Source/core/css/resolver/ViewportStyleResolver.cpp
|
| @@ -137,11 +137,11 @@ float ViewportStyleResolver::viewportArgumentValue(CSSPropertyID id) const
|
| if (id == CSSPropertyUserZoom)
|
| defaultValue = 1;
|
|
|
| - RefPtrWillBeRawPtr<CSSValue> value = m_propertySet->getPropertyCSSValue(id);
|
| + NullableCSSValue value = m_propertySet->getPropertyCSSValue(id);
|
| if (!value || !value->isPrimitiveValue())
|
| return defaultValue;
|
|
|
| - CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value.get());
|
| + CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
|
|
|
| if (primitiveValue->isNumber() || primitiveValue->isPx())
|
| return primitiveValue->getFloatValue();
|
| @@ -187,11 +187,11 @@ Length ViewportStyleResolver::viewportLengthValue(CSSPropertyID id) const
|
| || id == CSSPropertyMaxWidth
|
| || id == CSSPropertyMinWidth);
|
|
|
| - RefPtrWillBeRawPtr<CSSValue> value = m_propertySet->getPropertyCSSValue(id);
|
| + NullableCSSValue value = m_propertySet->getPropertyCSSValue(id);
|
| if (!value || !value->isPrimitiveValue())
|
| return Length(); // auto
|
|
|
| - CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value.get());
|
| + CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
|
|
|
| if (primitiveValue->getValueID() == CSSValueInternalExtendToZoom)
|
| return Length(ExtendToZoom);
|
|
|