content/browser/web_contents/web_contents_impl.cc - Issue 15567005: Plumb pinch virtual viewport flag to CC.

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 15567005: Plumb pinch virtual viewport flag to CC. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased for landing Created 7 years, 7 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:

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 eeba6d3fd9fdf03114c8cc6c0749d51f4e47490e..8a400cd6c2de1ad0e401ba182b537b46536ee28e 100644

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

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

@@ -538,6 +538,8 @@ WebPreferences WebContentsImpl::GetWebkitPrefs(RenderViewHost* rvh,

!command_line.HasSwitch(switches::kDisableThreadedHTMLParser);

prefs.experimental_websocket_enabled =

command_line.HasSwitch(switches::kEnableExperimentalWebSocket);

+ prefs.pinch_virtual_viewport_enabled =

+ command_line.HasSwitch(cc::switches::kEnablePinchVirtualViewport);

#if defined(OS_ANDROID)

prefs.user_gesture_required_for_media_playback = !command_line.HasSwitch(