Chromium compositor change implementing page-scale driven pinch-zoom.

content/browser/web_contents/web_contents_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/browser/web_contents/web_contents_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
@@ skipping 655 matching lines @@
   }
 
   prefs.fixed_position_creates_stacking_context = !command_line.HasSwitch(
       switches::kDisableFixedPositionCreatesStackingContext);
 
   prefs.gesture_tap_highlight_enabled = command_line.HasSwitch(
       switches::kEnableGestureTapHighlight);
 
   prefs.number_of_cpu_cores = base::SysInfo::NumberOfProcessors();
 
+  prefs.apply_page_scale_factor_in_compositor =
+      GpuProcessHost::gpu_enabled() &&

[jamesr, 2012/10/03 19:48:57]

this check seems unnecessary

[Jeff Timanus, 2012/10/03 20:56:04]

I followed the model of all of the other preference checks in this file.  All
the compositor related checks also check to see if the gpu is enabled. (For
example accelerated_compositing_enabled.)

+      command_line.HasSwitch(switches::kEnablePinchInCompositor);
+
   content::GetContentClient()->browser()->OverrideWebkitPrefs(rvh, url, &prefs);
 
   return prefs;
 }
 
 RenderViewHostManager* WebContentsImpl::GetRenderManagerForTesting() {
   return &render_manager_;
 }
 
 bool WebContentsImpl::OnMessageReceived(RenderViewHost* render_view_host,
@@ skipping 2696 matching lines @@
   }
 }
 
 content::BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() {
   return browser_plugin_guest_.get();
 }
 
 content::BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() {
   return browser_plugin_embedder_.get();
 }