Count presence of viewport tag as mobile-friendly

third_party/WebKit/Source/core/frame/VisualViewport.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "core/frame/VisualViewport.h"
 
 #include "core/dom/DOMNodeIds.h"
+#include "core/dom/ViewportDescription.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/PageScaleConstraints.h"
 #include "core/frame/PageScaleConstraintsSet.h"
 #include "core/frame/RootFrameViewport.h"
 #include "core/frame/Settings.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/layout/TextAutosizer.h"
 #include "core/layout/compositing/PaintLayerCompositor.h"
@@ skipping 683 matching lines @@
   if (!mainFrame())
     return;
 
   Document* document = mainFrame()->document();
   if (!document)
     return;
 
   if (!document->url().protocolIsInHTTPFamily())
     return;
 
-  m_trackPinchZoomStatsForPage = !shouldDisableDesktopWorkarounds();
+  m_trackPinchZoomStatsForPage =
+      !document->viewportDescription().isSpecifiedByAuthor();
 }
 
 void VisualViewport::userDidChangeScale() {
   if (!m_trackPinchZoomStatsForPage)
     return;
 
   m_maxPageScale = std::max(m_maxPageScale, m_scale);
 }
 
 void VisualViewport::sendUMAMetrics() {
@@ skipping 14 matching lines @@
       DEFINE_STATIC_LOCAL(EnumerationHistogram, maxScaleHistogram,
                           ("Viewport.MaxPageScale", 21));
       maxScaleHistogram.count(bucket);
     }
   }
 
   m_maxPageScale = -1;
   m_trackPinchZoomStatsForPage = false;
 }
 
-bool VisualViewport::shouldDisableDesktopWorkarounds() const {
-  if (!mainFrame() || !mainFrame()->view())
-    return false;
-
-  if (!mainFrame()->settings()->viewportEnabled())
-    return false;
-
-  // A document is considered adapted to small screen UAs if one of these holds:
-  // 1. The author specified viewport has a constrained width that is equal to
-  //    the initial viewport width.
-  // 2. The author has disabled viewport zoom.
-  const PageScaleConstraints& constraints =
-      frameHost().pageScaleConstraintsSet().pageDefinedConstraints();
-
-  return mainFrame()->view()->layoutSize().width() == m_size.width() ||
-         (constraints.minimumScale == constraints.maximumScale &&
-          constraints.minimumScale != -1);
-}
-
 CompositorAnimationTimeline* VisualViewport::compositorAnimationTimeline()
     const {
   ScrollingCoordinator* c = frameHost().page().scrollingCoordinator();
   return c ? c->compositorAnimationTimeline() : nullptr;
 }
 
 void VisualViewport::notifyRootFrameViewport() const {
   if (!mainFrame() || !mainFrame()->view())
     return;
 
@@ skipping 23 matching lines @@
   } else if (graphicsLayer == m_rootTransformLayer.get()) {
     name = "Root Transform Layer";
   } else {
     ASSERT_NOT_REACHED();
   }
 
   return name;
 }
 
 }  // namespace blink