content/renderer/render_view_impl.cc - Issue 11759023: [Android WebView] Implement WebSettings.{get|set}UseWideViewport

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/renderer/render_view_impl.cc

Issue 11759023: [Android WebView] Implement WebSettings.{get|set}UseWideViewport (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase and fix tests that were expecting UseWideViewPort=true Created 7 years, 11 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/renderer/render_view_impl.cc

diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc

index 31798d9ad72e3e5f0e7aaa991a56eb3ca5b169ab..2f3b2c4ddc1ebfdde152afc1f253e0ccf529e5ef 100644

--- a/content/renderer/render_view_impl.cc

+++ b/content/renderer/render_view_impl.cc

@@ -3276,9 +3276,7 @@ void RenderViewImpl::ProcessViewLayoutFlags(const CommandLine& command_line) {

webview()->enableFixedLayoutMode(enable_fixed_layout || enable_viewport);

webview()->settings()->setFixedElementsLayoutRelativeToFrame(true);

- if (enable_viewport) {

- webview()->settings()->setViewportEnabled(true);

- } else if (enable_fixed_layout) {

+ if (!enable_viewport && enable_fixed_layout) {

std::string str =

command_line.GetSwitchValueASCII(switches::kEnableFixedLayout);

std::vector<std::string> tokens;

« no previous file with comments | « content/public/common/common_param_traits_macros.h ('k') | webkit/glue/webpreferences.h » ('j') | no next file with comments »