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..84f90d03afb138faf9fefa340ba349a509674be8 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -2771,9 +2771,13 @@ 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);

[danakj, 2012/05/24 22:40:18]

Currently you would only need to do this when kEnablePinch and when
WebPrefs.applyDeviceScaleInCompositor() is false.

WebPrefs.applyDeviceScaleInCompositor() is presumably based on the viewport
flag, but I'd rather use it here instead so it catches everything it depends on.

[sadrul, 2012/05/24 22:51:37]

I think that involves moving applyDefaultDeviceScaleFactorInCompositor from
WebSettingsImpl into WebSettings? If so, I can include that change in the webkit
patch.

[danakj, 2012/05/24 22:55:38]

Can't you use WebPreferences instead?

[sadrul, 2012/05/24 22:59:58]

Wha. We totally can! Done. Thanks!

 
   webview()->enableFixedLayoutMode(enable_fixed_layout || enable_viewport);
   webview()->settings()->setFixedElementsLayoutRelativeToFrame(true);
+  if (enable_pinch)
+    webview()->setPageScaleFactorLimits(-1, -1);
 
   if (enable_viewport) {
     webview()->settings()->setViewportEnabled(true);