Simplify pinch flags.

content/renderer/render_view_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/bind.h"
@@ skipping 3159 matching lines @@
     }
   }
 
   ProcessAcceleratedPinchZoomFlags(command_line);
 }
 
 void RenderViewImpl::ProcessAcceleratedPinchZoomFlags(
     const CommandLine& command_line) {
   bool enable_viewport =
       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) {
     // Page scaling is disabled by default when applying a scale factor in the
     // compositor since they are currently incompatible.
     webview()->setPageScaleFactorLimits(1, 1);
   }
 
-  if (enable_pinch_in_compositor &&
-      webview()->isAcceleratedCompositingActive())
+  if (enable_pinch && webview()->isAcceleratedCompositingActive())
     webview()->setPageScaleFactorLimits(1, 4);
 }
 
 void RenderViewImpl::didStartProvisionalLoad(WebFrame* frame) {
   WebDataSource* ds = frame->provisionalDataSource();
   DocumentState* document_state = DocumentState::FromDataSource(ds);
 
   // Update the request time if WebKit has better knowledge of it.
   if (document_state->request_time().is_null()) {
     double event_time = ds->triggeringEventTime();
@@ skipping 3232 matching lines @@
 }
 #endif
 
 void RenderViewImpl::OnReleaseDisambiguationPopupDIB(
     TransportDIB::Handle dib_handle) {
   TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle);
   RenderProcess::current()->ReleaseTransportDIB(dib);
 }
 
 }  // namespace content