Recompute percentage based @viewport on resize.

Source/core/css/resolver/ViewportStyleResolver.cpp

Index: Source/core/css/resolver/ViewportStyleResolver.cpp
diff --git a/Source/core/css/resolver/ViewportStyleResolver.cpp b/Source/core/css/resolver/ViewportStyleResolver.cpp
index 34239374452d71ee590cdda4ac0ae685e9848c03..33853c462ec4c5cc7c816fb4848fcc6cb88a306b 100644
--- a/Source/core/css/resolver/ViewportStyleResolver.cpp
+++ b/Source/core/css/resolver/ViewportStyleResolver.cpp
@@ -96,10 +96,10 @@ void ViewportStyleResolver::resolve()
     arguments.zoom = getViewportArgumentValue(CSSPropertyZoom);
     arguments.minZoom = getViewportArgumentValue(CSSPropertyMinZoom);
     arguments.maxZoom = getViewportArgumentValue(CSSPropertyMaxZoom);
-    arguments.minWidth = getViewportArgumentValue(CSSPropertyMinWidth);
-    arguments.maxWidth = getViewportArgumentValue(CSSPropertyMaxWidth);
-    arguments.minHeight = getViewportArgumentValue(CSSPropertyMinHeight);
-    arguments.maxHeight = getViewportArgumentValue(CSSPropertyMaxHeight);
+    arguments.minWidth = getViewportLengthValue(CSSPropertyMinWidth);
+    arguments.maxWidth = getViewportLengthValue(CSSPropertyMaxWidth);
+    arguments.minHeight = getViewportLengthValue(CSSPropertyMinHeight);
+    arguments.maxHeight = getViewportLengthValue(CSSPropertyMaxHeight);
     arguments.orientation = getViewportArgumentValue(CSSPropertyOrientation);
 
     m_document->setViewportArguments(arguments);
@@ -133,12 +133,6 @@ float ViewportStyleResolver::getViewportArgumentValue(CSSPropertyID id) const
     if (primitiveValue->isPercentage()) {
         float percentValue = primitiveValue->getFloatValue() / 100.0f;
         switch (id) {
-        case CSSPropertyMaxHeight:
-        case CSSPropertyMinHeight:
-            return percentValue * m_document->initialViewportSize().height();
-        case CSSPropertyMaxWidth:
-        case CSSPropertyMinWidth:
-            return percentValue * m_document->initialViewportSize().width();
         case CSSPropertyMaxZoom:
         case CSSPropertyMinZoom:
         case CSSPropertyZoom:
@@ -167,4 +161,38 @@ float ViewportStyleResolver::getViewportArgumentValue(CSSPropertyID id) const
     }
 }
 
+Length ViewportStyleResolver::getViewportLengthValue(CSSPropertyID id) const

[esprehn, 2013/09/04 11:22:24]

This should really be called viewportLengthValue() or just viewportLength(). We
don't prefix things with get like this.

[rune, 2013/09/04 14:53:31]

Done.

+{
+    ASSERT(id == CSSPropertyMaxHeight
+        || id == CSSPropertyMinHeight
+        || id == CSSPropertyMaxWidth
+        || id == CSSPropertyMinWidth);
+
+    RefPtr<CSSValue> value = m_propertySet->getPropertyCSSValue(id);
+    if (!value || !value->isPrimitiveValue())
+        return Length(); // auto
+
+    CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value.get());
+
+    if (primitiveValue->isLength())
+        return primitiveValue->computeLength<Length>(m_document->renderStyle(), m_document->renderStyle());
+
+    if (primitiveValue->isViewportPercentageLength())
+        return primitiveValue->viewportPercentageLength();
+
+    if (primitiveValue->isPercentage())
+        return Length(primitiveValue->getFloatValue(), Percent);
+
+    switch (primitiveValue->getValueID()) {
+    case CSSValueInternalExtendToZoom:
+        return Length(ExtendToZoom);
+    case CSSValueAuto:
+        return Length();
+    default:
+        // Unrecognized keyword.
+        ASSERT_NOT_REACHED();
+        return Length(0, Fixed);
+    }
+}
+
 } // namespace WebCore