Translate viewport related meta tags into @viewport descriptors as suggested by the CSS Device Adap…

Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 69 matching lines @@
 #include "WebPagePopupImpl.h"
 #include "WebPlugin.h"
 #include "WebPluginAction.h"
 #include "WebPluginContainerImpl.h"
 #include "WebPopupMenuImpl.h"
 #include "WebRange.h"
 #include "WebSettingsImpl.h"
 #include "WebTextInputInfo.h"
 #include "WebViewClient.h"
 #include "core/accessibility/AXObjectCache.h"
+#include "core/css/StyleSheetContents.h"
 #include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Document.h"
 #include "core/dom/DocumentMarkerController.h"
 #include "core/dom/FullscreenController.h"
 #include "core/dom/KeyboardEvent.h"
 #include "core/dom/NodeRenderStyle.h"
 #include "core/dom/Text.h"
 #include "core/dom/WheelEvent.h"
 #include "core/editing/Editor.h"
 #include "core/editing/FrameSelection.h"
@@ skipping 2860 matching lines @@
     m_shouldAutoResize = false;
     configureAutoResizeMode();
 }
 
 void WebViewImpl::setUserAgentPageScaleConstraints(PageScaleConstraints newConstraints)
 {
     if (newConstraints == m_pageScaleConstraintsSet.userAgentConstraints())
         return;
 
     m_pageScaleConstraintsSet.setUserAgentConstraints(newConstraints);
+    m_pageScaleConstraintsSet.setNeedsReset(true);
+
+    Vector<String> whitelist;
+    Document* document = m_page->mainFrame()->document();
+    whitelist.append(document->url());
+
+    StringBuilder builder;
+
+    builder.append("@viewport{");
+
+    if (newConstraints.initialScale > 0) {
+        builder.appendLiteral("zoom:");
+        builder.append(String::number(newConstraints.initialScale));
+        builder.appendLiteral("!important;");
+    }
+
+    if (newConstraints.minimumScale > 0) {
+        builder.appendLiteral("min-zoom:");
+        builder.append(String::number(newConstraints.minimumScale));
+        builder.appendLiteral("!important;");
+    }
+
+    if (newConstraints.maximumScale > 0) {
+        builder.appendLiteral("max-zoom:");
+        builder.append(String::number(newConstraints.maximumScale));
+        builder.appendLiteral("!important;");
+    }
+
+    builder.append("}");
+
+    removeAllUserContent();
+    addUserStyleSheet(builder.toString(), whitelist, UserContentInjectInAllFrames, UserStyleInjectInExistingDocuments);
 
     if (!mainFrameImpl() || !mainFrameImpl()->frameView())
         return;
 
     mainFrameImpl()->frameView()->setNeedsLayout();
 }
 
 void WebViewImpl::setInitialPageScaleOverride(float initialPageScaleFactorOverride)
 {
     PageScaleConstraints constraints = m_pageScaleConstraintsSet.userAgentConstraints();
     constraints.initialScale = initialPageScaleFactorOverride;
-
-    if (constraints == m_pageScaleConstraintsSet.userAgentConstraints())
-        return;
-
-    m_pageScaleConstraintsSet.setNeedsReset(true);
     setUserAgentPageScaleConstraints(constraints);
 }
 
 void WebViewImpl::setPageScaleFactorLimits(float minPageScale, float maxPageScale)
 {
     PageScaleConstraints constraints = m_pageScaleConstraintsSet.userAgentConstraints();
     constraints.minimumScale = minPageScale;
     constraints.maximumScale = maxPageScale;
     setUserAgentPageScaleConstraints(constraints);
 }
@@ skipping 40 matching lines @@
     // isn't set at the end of a layout.
     if (view->needsLayout())
         view->layout();
 }
 
 void WebViewImpl::updatePageDefinedPageScaleConstraints(const ViewportArguments& arguments)
 {
     if (!settings()->viewportEnabled() || !isFixedLayoutModeEnabled() || !page() || !m_size.width || !m_size.height)
         return;
 
-    m_pageScaleConstraintsSet.updatePageDefinedConstraints(arguments, m_size, page()->settings()->layoutFallbackWidth());
+    m_pageScaleConstraintsSet.updatePageDefinedConstraints(arguments, m_size);
 
     if (settingsImpl()->supportDeprecatedTargetDensityDPI())
         m_pageScaleConstraintsSet.adjustPageDefinedConstraintsForAndroidWebView(arguments, m_size, page()->settings()->layoutFallbackWidth(), deviceScaleFactor(), page()->settings()->useWideViewport(), page()->settings()->loadWithOverviewMode());
 
     WebSize layoutSize = flooredIntSize(m_pageScaleConstraintsSet.pageDefinedConstraints().layoutSize);
 
     if (page()->settings() && page()->settings()->textAutosizingEnabled() && page()->mainFrame()
         && layoutSize.width != fixedLayoutSize().width)
             page()->mainFrame()->document()->textAutosizer()->recalculateMultipliers();
 
@@ skipping 1077 matching lines @@
     const WebMouseEvent& mouseEvent = static_cast<const WebMouseEvent&>(event);
 
     if (page())
         page()->pointerLockController()->dispatchLockedMouseEvent(
             PlatformMouseEventBuilder(mainFrameImpl()->frameView(), mouseEvent),
             eventType);
 }
 
 bool WebViewImpl::shouldDisableDesktopWorkarounds()
 {
-    ViewportArguments arguments = mainFrameImpl()->frame()->document()->viewportArguments();
-    return arguments.width == ViewportArguments::ValueDeviceWidth || !arguments.userZoom
-        || (arguments.minZoom == arguments.maxZoom && arguments.minZoom != ViewportArguments::ValueAuto);
+    Document* document = mainFrameImpl()->frame()->document();
+    return document->styleResolver()->viewportStyleResolver()->shouldDisableDesktopWorkarounds();
 }
 
 } // namespace WebKit