content/browser/web_contents/web_contents_impl.cc - Issue 11348353: Simplify pinch flags.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/web_contents/web_contents_impl.cc

Issue 11348353: Simplify pinch flags. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Add early out if not compositing. Created 8 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: content/browser/web_contents/web_contents_impl.cc

diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc

index 9bf52afc22bfe5f8f14028a3661644c8d8c015fb..a7c1e7ab183f0d84c143799f8fb928e9fc6d8308 100644

--- a/content/browser/web_contents/web_contents_impl.cc

+++ b/content/browser/web_contents/web_contents_impl.cc

@@ -653,7 +653,7 @@ WebPreferences WebContentsImpl::GetWebkitPrefs(RenderViewHost* rvh,

}

prefs.apply_page_scale_factor_in_compositor =

- command_line.HasSwitch(cc::switches::kEnablePinchInCompositor);

+ command_line.HasSwitch(switches::kEnablePinch);

prefs.per_tile_painting_enabled =

command_line.HasSwitch(cc::switches::kEnablePerTilePainting);

prefs.accelerated_animation_enabled =