Moved FrameHost::m_visualViewport to Page

third_party/WebKit/Source/core/html/ImageDocument.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2010 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 376 matching lines @@
       int newCheckerSize = kBaseCheckerSize;
       MouseCursorMode newCursorMode = Default;
 
       if (m_shrinkToFitMode == Viewport) {
         double scale;
 
         if (hasFinishedParsing()) {
           // To ensure the checker pattern is visible for large images, the
           // checker size is dynamically adjusted to account for how much the
           // page is currently being scaled.
-          scale = frame()->host()->visualViewport().scale();
+          scale = frame()->page()->visualViewport().scale();
         } else {
           // The checker pattern is initialized based on how large the image is
           // relative to the viewport.
-          int viewportWidth = frame()->host()->visualViewport().size().width();
+          int viewportWidth = frame()->page()->visualViewport().size().width();
           scale = viewportWidth / static_cast<double>(calculateDivWidth());
         }
 
         newCheckerSize = std::round(std::max(1.0, newCheckerSize / scale));
       } else {
         // In desktop mode, the user can click on the image to zoom in or out.
         DCHECK_EQ(m_shrinkToFitMode, Desktop);
         if (imageFitsInWindow()) {
           newCursorMode = Default;
         } else {
@@ skipping 92 matching lines @@
 
 int ImageDocument::calculateDivWidth() {
   // Zooming in and out of an image being displayed within a viewport is done
   // by changing the page scale factor of the page instead of changing the
   // size of the image.  The size of the image is set so that:
   // * Images wider than the viewport take the full width of the screen.
   // * Images taller than the viewport are initially aligned with the top of
   //   of the frame.
   // * Images smaller in either dimension are centered along that axis.
   LayoutSize imageSize = cachedImageSize(m_imageElement);
-  int viewportWidth = frame()->host()->visualViewport().size().width();
+  int viewportWidth = frame()->page()->visualViewport().size().width();
 
   // For huge images, minimum-scale=0.1 is still too big on small screens.
   // Set the <div> width so that the image will shrink to fit the width of the
   // screen when the scale is minimum.
   int maxWidth = std::min(imageSize.width().toInt(), viewportWidth * 10);
   return std::max(viewportWidth, maxWidth);
 }
 
 void ImageDocument::windowSizeChanged() {
   if (!m_imageElement || !m_imageSizeIsKnown ||
       m_imageElement->document() != this)
     return;
 
   if (m_shrinkToFitMode == Viewport) {
     LayoutSize imageSize = cachedImageSize(m_imageElement);
     int divWidth = calculateDivWidth();
     m_divElement->setInlineStyleProperty(CSSPropertyWidth, divWidth,
                                          CSSPrimitiveValue::UnitType::Pixels);
 
     // Explicitly set the height of the <div> containing the <img> so that it
     // can display the full image without shrinking it, allowing a full-width
     // reading mode for normal-width-huge-height images.
     float viewportAspectRatio =
-        frame()->host()->visualViewport().size().aspectRatio();
+        frame()->page()->visualViewport().size().aspectRatio();
     int divHeight = std::max(imageSize.height().toInt(),
                              static_cast<int>(divWidth / viewportAspectRatio));
     m_divElement->setInlineStyleProperty(CSSPropertyHeight, divHeight,
                                          CSSPrimitiveValue::UnitType::Pixels);
     return;
   }
 
   bool fitsInWindow = imageFitsInWindow();
 
   // If the image has been explicitly zoomed in, restore the cursor if the image
@@ skipping 74 matching lines @@
 }
 
 bool ImageEventListener::operator==(const EventListener& listener) const {
   if (const ImageEventListener* imageEventListener =
           ImageEventListener::cast(&listener))
     return m_doc == imageEventListener->m_doc;
   return false;
 }
 
 }  // namespace blink