Unset the page-scale-factor limits if enable-pinch flag is turned on.

content/renderer/render_view_impl.cc

Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 2bb8d1665f1af8ae27ed9c8d325b397f516647d6..1d82fe1485db9d090c006ace15d05ff12755223f 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -2771,9 +2771,14 @@ void RenderViewImpl::ProcessViewLayoutFlags(const CommandLine& command_line) {
       command_line.HasSwitch(switches::kEnableViewport);
   bool enable_fixed_layout =
       command_line.HasSwitch(switches::kEnableFixedLayout);
+  bool enable_pinch = enable_viewport ||
+                      command_line.HasSwitch(switches::kEnablePinch);
 
   webview()->enableFixedLayoutMode(enable_fixed_layout || enable_viewport);
   webview()->settings()->setFixedElementsLayoutRelativeToFrame(true);
+  if (enable_pinch &&
+      webkit_preferences_.apply_default_device_scale_factor_in_compositor)
+    webview()->setPageScaleFactorLimits(-1, -1);

[sadrul, 2012/05/25 00:34:08]

Perhaps there could be removePageScaleFactorLimits instead (or
useDefaultPageScaleFactorLimits)? That way, WebViewImpl can use -1 as an
internal detail to mean the default.

[danakj, 2012/05/25 04:17:57]

I do like the idea of WebViewImpl::setDefaultPageScaleFactorLimits() if @jamesr
will agree to that!

 
   if (enable_viewport) {
     webview()->settings()->setViewportEnabled(true);