Use css-device-adapt constraining for legacy viewport tags.

Source/core/css/resolver/ViewportStyleResolver.cpp

 /*
  * Copyright (C) 2012-2013 Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above
  *    copyright notice, this list of conditions and the following
  *    disclaimer.
@@ skipping 22 matching lines @@
 #include "CSSValueKeywords.h"
 #include "core/css/StylePropertySet.h"
 #include "core/css/StyleRule.h"
 #include "core/dom/Document.h"
 #include "core/dom/NodeRenderStyle.h"
 #include "core/dom/ViewportArguments.h"
 
 namespace WebCore {
 
 ViewportStyleResolver::ViewportStyleResolver(Document* document)
-    : m_document(document)
+    : m_document(document),
+    m_hasAuthorStyle(false)
 {
     ASSERT(m_document);
 }
 
 ViewportStyleResolver::~ViewportStyleResolver()
 {
 }
 
 void ViewportStyleResolver::addViewportRule(StyleRuleViewport* viewportRule)
 {
@@ skipping 17 matching lines @@
 void ViewportStyleResolver::clearDocument()
 {
     m_document = 0;
 }
 
 void ViewportStyleResolver::resolve()
 {
     if (!m_document)
         return;
 
-    if (!m_propertySet) {
-        // FIXME: This is not entirely correct. If the doctype is XHTML MP, or there is a Meta
-        // element for setting the viewport, the viewport arguments should fall back to those
-        // settings when the @viewport rules are all removed. For now, reset to implicit when
-        // there was an @viewport rule which has now been removed.
-        if (m_document->viewportArguments().type == ViewportArguments::CSSDeviceAdaptation) {
-            m_document->setViewportArguments(ViewportArguments());
-            m_document->updateViewportArguments();
-        }
+    if (!m_propertySet || (!m_hasAuthorStyle && m_document->hasLegacyViewportTag())) {
+        ASSERT(!m_hasAuthorStyle);
+        m_propertySet = 0;
+        m_document->setViewportArguments(ViewportArguments());
         return;
     }
 
-    ViewportArguments arguments(ViewportArguments::CSSDeviceAdaptation);
+    ViewportArguments arguments(m_hasAuthorStyle ? ViewportArguments::AuthorStyleSheet : ViewportArguments::UserAgentStyleSheet);
 
     arguments.userZoom = viewportArgumentValue(CSSPropertyUserZoom);
     arguments.zoom = viewportArgumentValue(CSSPropertyZoom);
     arguments.minZoom = viewportArgumentValue(CSSPropertyMinZoom);
     arguments.maxZoom = viewportArgumentValue(CSSPropertyMaxZoom);
     arguments.minWidth = viewportLengthValue(CSSPropertyMinWidth);
     arguments.maxWidth = viewportLengthValue(CSSPropertyMaxWidth);
     arguments.minHeight = viewportLengthValue(CSSPropertyMinHeight);
     arguments.maxHeight = viewportLengthValue(CSSPropertyMaxHeight);
     arguments.orientation = viewportArgumentValue(CSSPropertyOrientation);
 
     m_document->setViewportArguments(arguments);
-    m_document->updateViewportArguments();
 
     m_propertySet = 0;
+    m_hasAuthorStyle = false;
 }
 
 float ViewportStyleResolver::viewportArgumentValue(CSSPropertyID id) const
 {
     float defaultValue = ViewportArguments::ValueAuto;
 
     // UserZoom default value is CSSValueZoom, which maps to true, meaning that
     // yes, it is user scalable. When the value is set to CSSValueFixed, we
     // return false.
     if (id == CSSPropertyUserZoom)
@@ skipping 70 matching lines @@
     case CSSValueAuto:
         return Length();
     default:
         // Unrecognized keyword.
         ASSERT_NOT_REACHED();
         return Length(0, Fixed);
     }
 }
 
 } // namespace WebCore