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

Source/core/dom/Document.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
@@ skipping 25 matching lines @@
 #include "XMLNSNames.h"
 #include "XMLNames.h"
 #include "bindings/v8/CustomElementConstructorBuilder.h"
 #include "bindings/v8/Dictionary.h"
 #include "bindings/v8/ExceptionMessages.h"
 #include "bindings/v8/ExceptionState.h"
 #include "bindings/v8/ExceptionStatePlaceholder.h"
 #include "bindings/v8/ScriptController.h"
 #include "core/accessibility/AXObjectCache.h"
 #include "core/animation/DocumentTimeline.h"
+#include "core/css/CSSDefaultStyleSheets.h"
 #include "core/css/CSSStyleDeclaration.h"
 #include "core/css/CSSStyleSheet.h"
 #include "core/css/FontLoader.h"
 #include "core/css/MediaQueryMatcher.h"
 #include "core/css/StylePropertySet.h"
 #include "core/css/StyleSheetContents.h"
 #include "core/css/StyleSheetList.h"
 #include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Attr.h"
 #include "core/dom/BeforeUnloadEvent.h"
@@ skipping 365 matching lines @@
     , m_xmlStandalone(StandaloneUnspecified)
     , m_hasXMLDeclaration(0)
     , m_designMode(inherit)
     , m_hasAnnotatedRegions(false)
     , m_annotatedRegionsDirty(false)
     , m_useSecureKeyboardEntryWhenActive(false)
     , m_documentClasses(documentClasses)
     , m_isViewSource(false)
     , m_sawElementsInKnownNamespaces(false)
     , m_isSrcdocDocument(false)
+    , m_isMobileDocument(false)
     , m_renderer(0)
     , m_eventQueue(DocumentEventQueue::create(this))
     , m_weakFactory(this)
     , m_idAttributeName(idAttr)
     , m_hasFullscreenElementStack(false)
     , m_loadEventDelayCount(0)
     , m_loadEventDelayTimer(this, &Document::loadEventDelayTimerFired)
     , m_referrerPolicy(ReferrerPolicyDefault)
     , m_directionSetOnDocumentElement(false)
     , m_writingModeSetOnDocumentElement(false)
@@ skipping 220 matching lines @@
 }
 
 void Document::setDoctype(PassRefPtr<DocumentType> docType)
 {
     // This should never be called more than once.
     ASSERT(!m_docType || !docType);
     m_docType = docType;
     if (m_docType) {
         this->adoptIfNeeded(m_docType.get());
         if (m_docType->publicId().startsWith("-//wapforum//dtd xhtml mobile 1.", /* caseSensitive */ false))
-            processViewport("width=device-width, height=device-height", ViewportArguments::XHTMLMobileProfile);
+            m_isMobileDocument = true;
     }
     // Doctype affects the interpretation of the stylesheets.
     clearStyleResolver();
 }
 
 DOMImplementation* Document::implementation()
 {
     if (!m_implementation)
         m_implementation = DOMImplementation::create(this);
     return m_implementation.get();
@@ skipping 2234 matching lines @@
         callback(keyString, valueString, this, data);
     }
     if (error)
         reportViewportWarning(this, InvalidKeyValuePairSeparatorError, String(), String());
 }
 
 void Document::processViewport(const String& features, ViewportArguments::Type origin)
 {
     ASSERT(!features.isNull());
 
-    if (origin < m_viewportArguments.type)
+    if (origin < m_legacyViewportArguments.type)

[kenneth.r.christiansen, 2013/09/02 09:14:16]

I guess this needs a comment

[rune, 2013/09/02 11:53:39]

Done.

         return;
 
-    m_viewportArguments = ViewportArguments(origin);
-    processArguments(features, (void*)&m_viewportArguments, &setViewportFeature);
+    m_legacyViewportArguments = ViewportArguments(origin);
 
-    updateViewportArguments();
+    processArguments(features, (void*)&m_legacyViewportArguments, &setViewportFeature);
+
+    if (m_legacyViewportArguments.minZoom == ViewportArguments::ValueAuto)
+        m_legacyViewportArguments.minZoom = 0.25;
+
+    if (m_legacyViewportArguments.maxZoom == ViewportArguments::ValueAuto) {
+        m_legacyViewportArguments.maxZoom = 5;
+        if (m_legacyViewportArguments.minZoom > 5)
+            m_legacyViewportArguments.minZoom = 5;
+    }
+
+    if (m_legacyViewportArguments.maxWidth == ViewportArguments::ValueAuto) {
+
+        if (m_legacyViewportArguments.zoom == ViewportArguments::ValueAuto) {
+            m_legacyViewportArguments.minWidth = ViewportArguments::ValueExtendToZoom;
+            m_legacyViewportArguments.maxWidth = page()->settings().layoutFallbackWidth();
+        } else if (m_legacyViewportArguments.maxHeight == ViewportArguments::ValueAuto) {
+            m_legacyViewportArguments.minWidth = m_legacyViewportArguments.maxWidth = ViewportArguments::ValueExtendToZoom;
+        }
+    }
+
+    if (m_viewportArguments.type != ViewportArguments::CSSDeviceAdaptation)
+        useLegacyViewportArguments();
 }
 
 void Document::updateViewportArguments()
 {
     if (page() && page()->mainFrame() == frame()) {
 #ifndef NDEBUG
         m_didDispatchViewportPropertiesChanged = true;
 #endif
         page()->chrome().dispatchViewportPropertiesDidChange(m_viewportArguments);
     }
@@ skipping 2351 matching lines @@
 {
     return DocumentLifecycleNotifier::create(this);
 }
 
 DocumentLifecycleNotifier* Document::lifecycleNotifier()
 {
     return static_cast<DocumentLifecycleNotifier*>(ScriptExecutionContext::lifecycleNotifier());
 }
 
 } // namespace WebCore