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

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 <string>
 #include <vector>
@@ skipping 2816 matching lines @@
     navigation_state = NavigationState::CreateContentInitiated();
   }
   return navigation_state;
 }
 
 void RenderViewImpl::ProcessViewLayoutFlags(const CommandLine& command_line) {
   bool enable_viewport =
       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 &&
+      webkit_preferences_.default_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_viewport) {
     webview()->settings()->setViewportEnabled(true);
   } else if (enable_fixed_layout) {
     std::string str =
         command_line.GetSwitchValueASCII(switches::kEnableFixedLayout);
     std::vector<std::string> tokens;
     base::SplitString(str, ',', &tokens);
     if (tokens.size() == 2) {
       int width, height;
@@ skipping 2744 matching lines @@
 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
   return !!RenderThreadImpl::current()->compositor_thread();
 }
 
 void RenderViewImpl::OnJavaBridgeInit() {
   DCHECK(!java_bridge_dispatcher_);
 #if defined(ENABLE_JAVA_BRIDGE)
   java_bridge_dispatcher_ = new JavaBridgeDispatcher(this);
 #endif
 }