third_party/WebKit/Source/core/dom/Document.cpp - Issue 1785953002: Ignore viewport meta tags when Request Desktop Site is enabled.

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: third_party/WebKit/Source/core/dom/Document.cpp

Issue 1785953002: Ignore viewport meta tags when Request Desktop Site is enabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Call delegate() directly from NavigationControllerAndroid Created 4 years, 8 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

« content/browser/web_contents/web_contents_impl.cc ('K') | « third_party/WebKit/LayoutTests/scrollbars/layout-viewport-scrollbars-hidden.html ('k') | third_party/WebKit/Source/core/frame/FrameView.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/dom/Document.cpp

diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp

index 5598d4f4915aaa87f4144c8e2dd691553b5174fa..f39e80495909f71777ee10c04a83cc7da4631d5a 100644

--- a/third_party/WebKit/Source/core/dom/Document.cpp

+++ b/third_party/WebKit/Source/core/dom/Document.cpp

@@ -3179,6 +3179,9 @@ void Document::setViewportDescription(const ViewportDescription& viewportDescrip

if (viewportDescription == m_viewportDescription)

return;

+ if (settings() && !settings()->viewportMetaEnabled() && viewportDescription.isLegacyViewportType())

+ return;

// The UA-defined min-width is used by the processing of legacy meta tags.

if (!viewportDescription.isSpecifiedByAuthor())

m_viewportDefaultMinWidth = viewportDescription.minWidth;