Moved FrameHost::m_visualViewport to Page

third_party/WebKit/Source/web/PageOverlay.cpp

 /*
  * Copyright (C) 2011 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:
  *
  * 1. Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *
@@ skipping 10 matching lines @@
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * 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 "web/PageOverlay.h"
 
-#include "core/frame/FrameHost.h"
+#include <memory>
 #include "core/frame/LocalFrame.h"
 #include "core/frame/VisualViewport.h"
+#include "core/page/Page.h"
 #include "core/page/scrolling/ScrollingCoordinator.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/graphics/GraphicsLayerClient.h"
 #include "platform/scroll/MainThreadScrollingReason.h"
 #include "public/platform/WebLayer.h"
 #include "public/web/WebViewClient.h"
 #include "web/WebDevToolsAgentImpl.h"
 #include "web/WebFrameWidgetImpl.h"
 #include "web/WebLocalFrameImpl.h"
 #include "wtf/PtrUtil.h"
-#include <memory>
 
 namespace blink {
 
 std::unique_ptr<PageOverlay> PageOverlay::create(
     WebLocalFrameImpl* frameImpl,
     std::unique_ptr<PageOverlay::Delegate> delegate) {
   return WTF::wrapUnique(new PageOverlay(frameImpl, std::move(delegate)));
 }
 
 PageOverlay::PageOverlay(WebLocalFrameImpl* frameImpl,
@@ skipping 24 matching lines @@
 
     if (WebDevToolsAgentImpl* devTools = m_frameImpl->devToolsAgentImpl())
       devTools->willAddPageOverlay(m_layer.get());
 
     // This is required for contents of overlay to stay in sync with the page
     // while scrolling.
     WebLayer* platformLayer = m_layer->platformLayer();
     platformLayer->addMainThreadScrollingReasons(
         MainThreadScrollingReason::kPageOverlay);
     if (frame->isMainFrame()) {
-      frame->host()->visualViewport().containerLayer()->addChild(m_layer.get());
+      frame->page()->visualViewport().containerLayer()->addChild(m_layer.get());
     } else {
       toWebFrameWidgetImpl(m_frameImpl->frameWidget())
           ->rootGraphicsLayer()
           ->addChild(m_layer.get());
     }
   }
 
-  FloatSize size(frame->host()->visualViewport().size());
+  FloatSize size(frame->page()->visualViewport().size());
   if (size != m_layer->size())
     m_layer->setSize(size);
 
   m_layer->setNeedsDisplay();
 }
 
 LayoutRect PageOverlay::visualRect() const {
   DCHECK(m_layer.get());
   return LayoutRect(FloatPoint(), m_layer->size());
 }
 
 IntRect PageOverlay::computeInterestRect(const GraphicsLayer* graphicsLayer,
                                          const IntRect&) const {
   return IntRect(IntPoint(), expandedIntSize(m_layer->size()));
 }
 
 void PageOverlay::paintContents(const GraphicsLayer* graphicsLayer,
                                 GraphicsContext& gc,
                                 GraphicsLayerPaintingPhase phase,
                                 const IntRect& interestRect) const {
   DCHECK(m_layer);
   m_delegate->paintPageOverlay(*this, gc, interestRect.size());
 }
 
 String PageOverlay::debugName(const GraphicsLayer*) const {
   return "WebViewImpl Page Overlay Content Layer";
 }
 
 }  // namespace blink