Remove FrameHost::browserControls()

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

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Dirk Mueller <mueller@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *           (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
@@ skipping 1397 matching lines @@
   float zoom = frame().pageZoomFactor();
 
   LayoutViewItem layoutViewItem = this->layoutViewItem();
   if (layoutViewItem.isNull())
     return FloatSize();
 
   FloatSize layoutSize;
   layoutSize.setWidth(layoutViewItem.viewWidth(IncludeScrollbars) / zoom);
   layoutSize.setHeight(layoutViewItem.viewHeight(IncludeScrollbars) / zoom);
 
-  BrowserControls& browserControls = m_frame->host()->browserControls();
+  BrowserControls& browserControls = m_frame->page()->browserControls();
   if (RuntimeEnabledFeatures::inertTopControlsEnabled() &&
       browserControls.permittedState() != WebBrowserControlsHidden) {
     // We use the layoutSize rather than frameRect to calculate viewport units
     // so that we get correct results on mobile where the page is laid out into
     // a rect that may be larger than the viewport (e.g. the 980px fallback
     // width for desktop pages). Since the layout height is statically set to
     // be the viewport with browser controls showing, we add the browser
     // controls height, compensating for page scale as well, since we want to
     // use the viewport with browser controls hidden for vh (to match Safari).
     int viewportWidth = m_frame->host()->visualViewport().size().width();
@@ skipping 210 matching lines @@
     // to issue the invalidation).  This is because the background fills the
     // main GraphicsLayer, which takes the size of the layout viewport.
     // TODO(skobes): Paint non-fixed backgrounds into the scrolling contents
     // layer and avoid this invalidation (http://crbug.com/568847).
     LayoutViewItem lvi = layoutViewItem();
     if (!lvi.isNull())
       lvi.setShouldDoFullPaintInvalidation();
   }
 
   if (RuntimeEnabledFeatures::inertTopControlsEnabled() && layoutView() &&
-      m_frame->isMainFrame() && m_frame->host()->browserControls().height()) {
+      m_frame->isMainFrame() && m_frame->page()->browserControls().height()) {
     if (layoutView()->style()->hasFixedBackgroundImage()) {
       // In the case where we don't change layout size from top control resizes,
       // we wont perform a layout. If we have a fixed background image however,
       // the background layer needs to get resized so we should request a layout
       // explicitly.
       PaintLayer* layer = layoutView()->layer();
       if (layoutView()->compositor()->needsFixedRootBackgroundLayer(layer)) {
         setNeedsLayout();
       } else if (!rootLayerScrollingEnabled) {
         // If root layer scrolls is on, we've already issued a full invalidation
@@ skipping 3593 matching lines @@
 void FrameView::setAnimationHost(
     std::unique_ptr<CompositorAnimationHost> host) {
   m_animationHost = std::move(host);
 }
 
 LayoutUnit FrameView::caretWidth() const {
   return LayoutUnit(getHostWindow()->windowToViewportScalar(1));
 }
 
 }  // namespace blink