Simplify pinch flags.

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 b56a17eb6b246ed3da4a9dcc1eb18b42a781c1c4..d8701dc38b230b66dbd38f0b4b5fbad1bbc1e5b7 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -3179,10 +3179,10 @@ void RenderViewImpl::ProcessAcceleratedPinchZoomFlags(
       command_line.HasSwitch(switches::kEnableViewport);
   bool enable_pinch = enable_viewport ||

[aelias_OOO_until_Jul13, 2012/12/03 18:34:35]

This logic is broken because enable_viewport is also true on Android.

In general this whole method has accumulated a lot of cruft, please simplify it
as follows:

{
bool enable_viewport = command_line.HasSwitch(...);
bool enable_pinch = command_line.HasSwitch(...);

if (enable_viewport)
  return;

if (enable_pinch)
  webview()->setPageScaleFactorLimits(1, 4);
else
  webview()->setPageScaleFactorLimits(1, 1);
}

(I'm phrasing it this way because viewport tag support is the real reason we
don't need to make this call on Android.)

                       command_line.HasSwitch(switches::kEnablePinch);
-  bool enable_pinch_in_compositor =
-      command_line.HasSwitch(cc::switches::kEnablePinchInCompositor);
+  bool enable_css_transform_pinch =
+      command_line.HasSwitch(switches::kEnableCssTransformPinch);
 
-  if (!enable_pinch &&
+  if (!(enable_pinch || enable_css_transform_pinch) &&
       webview()->isAcceleratedCompositingActive() &&
       webkit_preferences_.apply_default_device_scale_factor_in_compositor &&
       device_scale_factor_ != 1) {
@@ -3191,8 +3191,7 @@ void RenderViewImpl::ProcessAcceleratedPinchZoomFlags(
     webview()->setPageScaleFactorLimits(1, 1);
   }
 
-  if (enable_pinch_in_compositor &&
-      webview()->isAcceleratedCompositingActive())
+  if (enable_pinch && webview()->isAcceleratedCompositingActive())
     webview()->setPageScaleFactorLimits(1, 4);
 }