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

Unified Diff: Source/core/dom/Document.cpp

Issue 40423003: Experimental viewport meta tag support for desktop, Blink-side. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase again Created 7 years, 1 month 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
« no previous file with comments | « Source/core/css/viewportAndroid.css ('k') | Source/core/page/Settings.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/Document.cpp
diff --git a/Source/core/dom/Document.cpp b/Source/core/dom/Document.cpp
index f7dc5c041d91a896b180cbc31c47a3c389e76f2e..b8f0049bb20c97bc601850201760c21ceed7ee33 100644
--- a/Source/core/dom/Document.cpp
+++ b/Source/core/dom/Document.cpp
@@ -2928,6 +2928,9 @@ bool Document::shouldMergeWithLegacyDescription(ViewportDescription::Type origin
void Document::setViewportDescription(const ViewportDescription& viewportDescription)
{
if (viewportDescription.isLegacyViewportType()) {
+ if (settings() && !settings()->viewportMetaEnabled())
+ return;
+
m_legacyViewportDescription = viewportDescription;
// When no author style for @viewport is present, and a meta tag for defining
« no previous file with comments | « Source/core/css/viewportAndroid.css ('k') | Source/core/page/Settings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698