Moved FrameHost::m_visualViewport to Page

third_party/WebKit/Source/core/dom/ViewportDescription.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, 2011 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2008 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
@@ skipping 12 matching lines @@
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #include "core/dom/ViewportDescription.h"
 
 #include "core/dom/Document.h"
-#include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/frame/VisualViewport.h"
+#include "core/page/Page.h"
 #include "platform/Histogram.h"
 #include "platform/weborigin/KURL.h"
 
 namespace blink {
 
 static const float& compareIgnoringAuto(const float& value1,
                                         const float& value2,
                                         const float& (*compare)(const float&,
                                                                 const float&)) {
   if (value1 == ViewportDescription::ValueAuto)
@@ skipping 194 matching lines @@
     NoViewportTag,
     DeviceWidth,
     ConstantWidth,
     MetaWidthOther,
     MetaHandheldFriendly,
     MetaMobileOptimized,
     XhtmlMobileProfile,
     TypeCount
   };
 
-  if (!mainFrame || !mainFrame->host() || !mainFrame->view() ||
+  if (!mainFrame || !mainFrame->page() || !mainFrame->view() ||
       !mainFrame->document())
     return;
 
   // Avoid chrome:// pages like the new-tab page (on Android new tab is
   // non-http).
   if (!mainFrame->document()->url().protocolIsInHTTPFamily())
     return;
 
   DEFINE_STATIC_LOCAL(EnumerationHistogram, metaTagTypeHistogram,
                       ("Viewport.MetaTagType", TypeCount));
   if (!isSpecifiedByAuthor()) {
     metaTagTypeHistogram.count(mainFrame->document()->isMobileDocument()
                                    ? XhtmlMobileProfile
                                    : NoViewportTag);
     return;
   }
 
   if (isMetaViewportType()) {
     if (maxWidth.type() == blink::Fixed) {
       metaTagTypeHistogram.count(ConstantWidth);
 
       if (mainFrame->view()) {
         // To get an idea of how "far" the viewport is from the device's ideal
         // width, we report the zoom level that we'd need to be at for the
         // entire page to be visible.
         int viewportWidth = maxWidth.intValue();
-        int windowWidth = mainFrame->host()->visualViewport().size().width();
+        int windowWidth = mainFrame->page()->visualViewport().size().width();
         int overviewZoomPercent =
             100 * windowWidth / static_cast<float>(viewportWidth);
         DEFINE_STATIC_LOCAL(SparseHistogram, overviewZoomHistogram,
                             ("Viewport.OverviewZoom"));
         overviewZoomHistogram.sample(overviewZoomPercent);
       }
 
     } else if (maxWidth.type() == blink::DeviceWidth ||
                maxWidth.type() == blink::ExtendToZoom) {
       metaTagTypeHistogram.count(DeviceWidth);
     } else {
       // Overflow bucket for cases we may be unaware of.
       metaTagTypeHistogram.count(MetaWidthOther);
     }
   } else if (type == ViewportDescription::HandheldFriendlyMeta) {
     metaTagTypeHistogram.count(MetaHandheldFriendly);
   } else if (type == ViewportDescription::MobileOptimizedMeta) {
     metaTagTypeHistogram.count(MetaMobileOptimized);
   }
 #endif
 }
 
 bool ViewportDescription::matchesHeuristicsForGpuRasterization() const {
   return isSpecifiedByAuthor();
 }
 
 }  // namespace blink