| Index: Source/core/css/resolver/ViewportStyleResolver.cpp
|
| diff --git a/Source/core/css/resolver/ViewportStyleResolver.cpp b/Source/core/css/resolver/ViewportStyleResolver.cpp
|
| index 23f0dae69ac0ee309a4f8fbb106fe1a4c1cb2665..fbfbc91fce7d4061e79872559c9430e0c77702d4 100644
|
| --- a/Source/core/css/resolver/ViewportStyleResolver.cpp
|
| +++ b/Source/core/css/resolver/ViewportStyleResolver.cpp
|
| @@ -137,20 +137,20 @@ float ViewportStyleResolver::viewportArgumentValue(CSSPropertyID id) const
|
| if (id == CSSPropertyUserZoom)
|
| defaultValue = 1;
|
|
|
| - NullableCSSValue value = m_propertySet->getPropertyCSSValue(id);
|
| + const NullableCSSValue& value = m_propertySet->getPropertyCSSValue(id);
|
| if (!value || !value->isPrimitiveValue())
|
| return defaultValue;
|
|
|
| - CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
|
| + const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
|
|
|
| - if (primitiveValue->isNumber() || primitiveValue->isPx())
|
| - return primitiveValue->getFloatValue();
|
| + if (primitiveValue.isNumber() || primitiveValue.isPx())
|
| + return primitiveValue.getFloatValue();
|
|
|
| - if (primitiveValue->isFontRelativeLength())
|
| - return primitiveValue->getFloatValue() * m_document->computedStyle()->fontDescription().computedSize();
|
| + if (primitiveValue.isFontRelativeLength())
|
| + return primitiveValue.getFloatValue() * m_document->computedStyle()->fontDescription().computedSize();
|
|
|
| - if (primitiveValue->isPercentage()) {
|
| - float percentValue = primitiveValue->getFloatValue() / 100.0f;
|
| + if (primitiveValue.isPercentage()) {
|
| + float percentValue = primitiveValue.getFloatValue() / 100.0f;
|
| switch (id) {
|
| case CSSPropertyMaxZoom:
|
| case CSSPropertyMinZoom:
|
| @@ -162,7 +162,7 @@ float ViewportStyleResolver::viewportArgumentValue(CSSPropertyID id) const
|
| }
|
| }
|
|
|
| - switch (primitiveValue->getValueID()) {
|
| + switch (primitiveValue.getValueID()) {
|
| case CSSValueAuto:
|
| return defaultValue;
|
| case CSSValueLandscape:
|
| @@ -187,13 +187,13 @@ Length ViewportStyleResolver::viewportLengthValue(CSSPropertyID id) const
|
| || id == CSSPropertyMaxWidth
|
| || id == CSSPropertyMinWidth);
|
|
|
| - NullableCSSValue value = m_propertySet->getPropertyCSSValue(id);
|
| + const NullableCSSValue& value = m_propertySet->getPropertyCSSValue(id);
|
| if (!value || !value->isPrimitiveValue())
|
| return Length(); // auto
|
|
|
| - CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
|
| + const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
|
|
|
| - if (primitiveValue->getValueID() == CSSValueInternalExtendToZoom)
|
| + if (primitiveValue.getValueID() == CSSValueInternalExtendToZoom)
|
| return Length(ExtendToZoom);
|
|
|
| ComputedStyle* documentStyle = m_document->mutableComputedStyle();
|
| @@ -209,10 +209,10 @@ Length ViewportStyleResolver::viewportLengthValue(CSSPropertyID id) const
|
| CSSToLengthConversionData::FontSizes fontSizes(documentStyle, documentStyle);
|
| CSSToLengthConversionData::ViewportSize viewportSize(width, height);
|
|
|
| - if (primitiveValue->getValueID() == CSSValueAuto)
|
| + if (primitiveValue.getValueID() == CSSValueAuto)
|
| return Length(Auto);
|
|
|
| - Length result = primitiveValue->convertToLength(CSSToLengthConversionData(documentStyle, fontSizes, viewportSize, 1.0f));
|
| + Length result = primitiveValue.convertToLength(CSSToLengthConversionData(documentStyle, fontSizes, viewportSize, 1.0f));
|
| if (documentStyle->hasViewportUnits())
|
| m_document->setHasViewportUnits();
|
| documentStyle->setHasViewportUnits(documentStyleHasViewportUnits);
|
|
|