From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001
From: Lorry Tar Creator <lorry-tar-importer@lorry>
Date: Tue, 27 Jun 2017 06:07:23 +0000
Subject: webkitgtk-2.16.5

---
 Source/WebCore/css/ViewportStyleResolver.cpp | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'Source/WebCore/css/ViewportStyleResolver.cpp')

diff --git a/Source/WebCore/css/ViewportStyleResolver.cpp b/Source/WebCore/css/ViewportStyleResolver.cpp
index cbc398a26..dc3421924 100644
--- a/Source/WebCore/css/ViewportStyleResolver.cpp
+++ b/Source/WebCore/css/ViewportStyleResolver.cpp
@@ -34,6 +34,7 @@
 
 #include "CSSValueKeywords.h"
 #include "Document.h"
+#include "NodeRenderStyle.h"
 #include "Page.h"
 #include "RenderView.h"
 #include "StyleProperties.h"
@@ -70,7 +71,7 @@ void ViewportStyleResolver::addViewportRule(StyleRuleViewport* viewportRule)
 
 void ViewportStyleResolver::clearDocument()
 {
-    m_document = 0;
+    m_document = nullptr;
 }
 
 void ViewportStyleResolver::resolve()
@@ -93,7 +94,7 @@ void ViewportStyleResolver::resolve()
     m_document->setViewportArguments(arguments);
     m_document->updateViewportArguments();
 
-    m_propertySet = 0;
+    m_propertySet = nullptr;
 }
 
 float ViewportStyleResolver::getViewportArgumentValue(CSSPropertyID id) const
@@ -107,19 +108,19 @@ float ViewportStyleResolver::getViewportArgumentValue(CSSPropertyID id) const
         defaultValue = 1;
 
     RefPtr<CSSValue> value = m_propertySet->getPropertyCSSValue(id);
-    if (!value || !value->isPrimitiveValue())
+    if (!is<CSSPrimitiveValue>(value.get()))
         return defaultValue;
 
-    CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value.get());
+    CSSPrimitiveValue& primitiveValue = downcast<CSSPrimitiveValue>(*value);
 
-    if (primitiveValue->isNumber() || primitiveValue->isPx())
-        return primitiveValue->getFloatValue();
+    if (primitiveValue.isNumber() || primitiveValue.isPx())
+        return primitiveValue.floatValue();
 
-    if (primitiveValue->isFontRelativeLength())
-        return primitiveValue->getFloatValue() * m_document->documentElement()->renderStyle()->fontDescription().computedSize();
+    if (primitiveValue.isFontRelativeLength())
+        return primitiveValue.floatValue() * m_document->documentElement()->renderStyle()->fontDescription().computedSize();
 
-    if (primitiveValue->isPercentage()) {
-        float percentValue = primitiveValue->getFloatValue() / 100.0f;
+    if (primitiveValue.isPercentage()) {
+        float percentValue = primitiveValue.floatValue() / 100.0f;
         switch (id) {
         case CSSPropertyMaxHeight:
         case CSSPropertyMinHeight:
@@ -139,7 +140,7 @@ float ViewportStyleResolver::getViewportArgumentValue(CSSPropertyID id) const
         }
     }
 
-    switch (primitiveValue->getValueID()) {
+    switch (primitiveValue.valueID()) {
     case CSSValueAuto:
         return defaultValue;
     case CSSValueDeviceHeight:
-- 
cgit v1.2.1