Ignore viewport meta tags when Request Desktop Site is enabled.

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
@@ skipping 3116 matching lines @@
 bool Document::shouldMergeWithLegacyDescription(ViewportDescription::Type origin)
 {
     return settings() && settings()->viewportMetaMergeContentQuirk() && m_legacyViewportDescription.isMetaViewportType() && m_legacyViewportDescription.type == origin;
 }
 
 void Document::setViewportDescription(const ViewportDescription& viewportDescription)
 {
     if (viewportDescription == m_viewportDescription)
         return;
 
+    if (settings() && !settings()->viewportMetaEnabled() && viewportDescription.isMetaViewportType())

[johnme, 2016/03/15 11:38:10]

Why do you only disable meta viewport in Request Desktop Mode? Why not also
ignore HandheldFriendlyMeta and MobileOptimizedMeta?

As for @viewport, are you treating that differently because the spec says it
should be implemented the same on mobile and desktop?

[aelias_OOO_until_Jul13, 2016/03/15 19:14:15]

Those are rarely seen, and I think it's especially unlikely that an old site
would send a HandheldFriendlyMeta in response to a desktop UA.  I think there's
an argument to be made that from the point of view of the Blink setting,
!viewportMetaEnabled should disable *all* legacy viewport tags though.
There's already a separate setting "viewportEnabled" for @viewport yes.  Note
that we need to always support it in some form on Android since the magic "980"
value for desktop sites is in an @viewport tag for viewportAndroid.css.

[aelias_OOO_until_Jul13, 2016/03/15 19:29:26]

OK, I made this change.

+        return;
+
     // The UA-defined min-width is used by the processing of legacy meta tags.
     if (!viewportDescription.isSpecifiedByAuthor())
         m_viewportDefaultMinWidth = viewportDescription.minWidth;
 
     if (viewportDescription.isLegacyViewportType()) {
         m_legacyViewportDescription = viewportDescription;
 
         // When no author style for @viewport is present, and a meta tag for defining
         // the viewport is, apply the meta tag viewport instead of the UA styles.
         if (m_viewportDescription.type == ViewportDescription::AuthorStyleSheet)
@@ skipping 2849 matching lines @@
 #ifndef NDEBUG
 using namespace blink;
 void showLiveDocumentInstances()
 {
     Document::WeakDocumentSet& set = Document::liveDocumentSet();
     fprintf(stderr, "There are %u documents currently alive:\n", set.size());
     for (Document* document : set)
         fprintf(stderr, "- Document %p URL: %s\n", document, document->url().getString().utf8().data());
 }
 #endif