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

Side by Side 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: Change loop style 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. 8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
(...skipping 3161 matching lines...) Expand 10 before | Expand all | Expand 10 after
3172 bool Document::shouldMergeWithLegacyDescription(ViewportDescription::Type origin ) 3172 bool Document::shouldMergeWithLegacyDescription(ViewportDescription::Type origin )
3173 { 3173 {
3174 return settings() && settings()->viewportMetaMergeContentQuirk() && m_legacy ViewportDescription.isMetaViewportType() && m_legacyViewportDescription.type == origin; 3174 return settings() && settings()->viewportMetaMergeContentQuirk() && m_legacy ViewportDescription.isMetaViewportType() && m_legacyViewportDescription.type == origin;
3175 } 3175 }
3176 3176
3177 void Document::setViewportDescription(const ViewportDescription& viewportDescrip tion) 3177 void Document::setViewportDescription(const ViewportDescription& viewportDescrip tion)
3178 { 3178 {
3179 if (viewportDescription == m_viewportDescription) 3179 if (viewportDescription == m_viewportDescription)
3180 return; 3180 return;
3181 3181
3182 if (settings() && !settings()->viewportMetaEnabled() && viewportDescription. isLegacyViewportType())
3183 return;
3184
3182 // The UA-defined min-width is used by the processing of legacy meta tags. 3185 // The UA-defined min-width is used by the processing of legacy meta tags.
3183 if (!viewportDescription.isSpecifiedByAuthor()) 3186 if (!viewportDescription.isSpecifiedByAuthor())
3184 m_viewportDefaultMinWidth = viewportDescription.minWidth; 3187 m_viewportDefaultMinWidth = viewportDescription.minWidth;
3185 3188
3186 if (viewportDescription.isLegacyViewportType()) { 3189 if (viewportDescription.isLegacyViewportType()) {
3187 m_legacyViewportDescription = viewportDescription; 3190 m_legacyViewportDescription = viewportDescription;
3188 3191
3189 // When no author style for @viewport is present, and a meta tag for def ining 3192 // When no author style for @viewport is present, and a meta tag for def ining
3190 // the viewport is, apply the meta tag viewport instead of the UA styles . 3193 // the viewport is, apply the meta tag viewport instead of the UA styles .
3191 if (m_viewportDescription.type == ViewportDescription::AuthorStyleSheet) 3194 if (m_viewportDescription.type == ViewportDescription::AuthorStyleSheet)
(...skipping 2844 matching lines...) Expand 10 before | Expand all | Expand 10 after
6036 #ifndef NDEBUG 6039 #ifndef NDEBUG
6037 using namespace blink; 6040 using namespace blink;
6038 void showLiveDocumentInstances() 6041 void showLiveDocumentInstances()
6039 { 6042 {
6040 Document::WeakDocumentSet& set = Document::liveDocumentSet(); 6043 Document::WeakDocumentSet& set = Document::liveDocumentSet();
6041 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 6044 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
6042 for (Document* document : set) 6045 for (Document* document : set)
6043 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().get String().utf8().data()); 6046 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().get String().utf8().data());
6044 } 6047 }
6045 #endif 6048 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698