Moved FrameHost::m_visualViewport to Page

third_party/WebKit/Source/core/layout/LayoutMedia.cpp

 /*
  * Copyright (C) 2007, 2008, 2009, 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
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 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 "core/layout/LayoutMedia.h"
 
-#include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/VisualViewport.h"
 #include "core/html/HTMLMediaElement.h"
 #include "core/html/shadow/MediaControls.h"
 #include "core/layout/LayoutView.h"
 #include "core/page/Page.h"
 
 namespace blink {
 
 LayoutMedia::LayoutMedia(HTMLMediaElement* video) : LayoutImage(video) {
@@ skipping 105 matching lines @@
   // if it is out of process. See https://crbug.com/662480
   if (document().page()->mainFrame()->isRemoteFrame())
     return mediaRect.width();
 
   // TODO(foolip): when going fullscreen, the animation sometimes does not clear
   // up properly and the last `absoluteXOffset` received is incorrect. This is
   // a shortcut that we could ideally avoid. See https://crbug.com/663680
   if (mediaElement() && mediaElement()->isFullscreen())
     return mediaRect.width();
 
-  FrameHost* frameHost = document().frameHost();
-  LocalFrame* mainFrame = document().page()->deprecatedLocalMainFrame();
+  Page* page = document().page();
+  LocalFrame* mainFrame = page->deprecatedLocalMainFrame();
   FrameView* pageView = mainFrame ? mainFrame->view() : nullptr;
-  if (!frameHost || !mainFrame || !pageView)
+  if (!mainFrame || !pageView)
     return mediaRect.width();
 
   if (pageView->horizontalScrollbarMode() != ScrollbarAlwaysOff)
     return mediaRect.width();
 
   // On desktop, this will include scrollbars when they stay visible.
-  const LayoutUnit visibleWidth(frameHost->visualViewport().visibleWidth());
+  const LayoutUnit visibleWidth(page->visualViewport().visibleWidth());
   const LayoutUnit absoluteXOffset(
       localToAbsolute(
           FloatPoint(mediaRect.location()),
           UseTransforms | ApplyContainerFlip | TraverseDocumentBoundaries)
           .x());
   const LayoutUnit newWidth = visibleWidth - absoluteXOffset;
 
   if (newWidth < 0)
     return mediaRect.width();
 
   return std::min(mediaRect.width(), visibleWidth - absoluteXOffset);
 }
 
 }  // namespace blink