Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(697)

Unified Diff: content/renderer/render_view_impl.cc

Issue 10916279: Chromium compositor change implementing page-scale driven pinch-zoom. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Rebaseline to 160227. Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/render_view_impl.cc
===================================================================
--- content/renderer/render_view_impl.cc (revision 160227)
+++ content/renderer/render_view_impl.cc (working copy)
@@ -3151,6 +3151,8 @@
command_line.HasSwitch(switches::kEnableFixedLayout);
bool enable_pinch = enable_viewport ||
command_line.HasSwitch(switches::kEnablePinch);
+ bool enable_pinch_in_compositor =
+ command_line.HasSwitch(switches::kEnablePinchInCompositor);
webview()->enableFixedLayoutMode(enable_fixed_layout || enable_viewport);
webview()->settings()->setFixedElementsLayoutRelativeToFrame(true);
@@ -3163,6 +3165,10 @@
webview()->setPageScaleFactorLimits(1, 1);
}
+ if (enable_pinch_in_compositor &&
+ webview()->isAcceleratedCompositingActive())
+ webview()->setPageScaleFactorLimits(1, 4);
piman 2012/10/05 00:01:08 note: this is possibly racy. isAcceleratedComposit
Jeff Timanus 2012/10/05 00:05:34 If this is racey, are the other conditions also ra
piman 2012/10/05 00:25:51 Most likely, yes.
Jeff Timanus 2012/10/05 15:37:50 I'm not sure if fixing these races is appropriate
+
if (enable_viewport) {
webview()->settings()->setViewportEnabled(true);
} else if (enable_fixed_layout) {

Powered by Google App Engine
This is Rietveld 408576698