Make BrowserControls take and store a Page instead of a FrameHost

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/frame/BrowserControls.h"
 
 #include <algorithm>  // for std::min and std::max
 
 #include "core/frame/FrameHost.h"
 #include "core/frame/VisualViewport.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/Page.h"
 #include "platform/geometry/FloatSize.h"
 
 namespace blink {
 
-BrowserControls::BrowserControls(const FrameHost& frameHost)
-    : m_frameHost(&frameHost),
+BrowserControls::BrowserControls(const Page& page)
+    : m_page(&page),
       m_height(0),
       m_shownRatio(0),
       m_baselineContentOffset(0),
       m_accumulatedScrollDelta(0),
       m_shrinkViewport(false),
       m_permittedState(WebBrowserControlsBoth) {}
 
 DEFINE_TRACE(BrowserControls) {
-  visitor->trace(m_frameHost);
+  visitor->trace(m_page);
 }
 
 void BrowserControls::scrollBegin() {
   resetBaseline();
 }
 
 FloatSize BrowserControls::scrollBy(FloatSize pendingDelta) {
   if ((m_permittedState == WebBrowserControlsShown &&
        pendingDelta.height() > 0) ||
       (m_permittedState == WebBrowserControlsHidden &&
        pendingDelta.height() < 0))
     return pendingDelta;
 
   if (m_height == 0)
     return pendingDelta;
 
   float oldOffset = contentOffset();
-  float pageScale = m_frameHost->visualViewport().scale();
+  float pageScale = m_page->frameHost().visualViewport().scale();
 
   // Update accumulated vertical scroll and apply it to browser controls
   // Compute scroll delta in viewport space by applying page scale
   m_accumulatedScrollDelta += pendingDelta.height() * pageScale;
 
   float newContentOffset = m_baselineContentOffset - m_accumulatedScrollDelta;
 
   setShownRatio(newContentOffset / m_height);
 
   // Reset baseline when controls are fully visible
@@ skipping 25 matching lines @@
 }
 
 void BrowserControls::setShownRatio(float shownRatio) {
   shownRatio = std::min(shownRatio, 1.f);
   shownRatio = std::max(shownRatio, 0.f);
 
   if (m_shownRatio == shownRatio)
     return;
 
   m_shownRatio = shownRatio;
-  m_frameHost->page().chromeClient().didUpdateBrowserControls();
+  m_page->chromeClient().didUpdateBrowserControls();
 }
 
 void BrowserControls::updateConstraintsAndState(
     WebBrowserControlsState constraints,
     WebBrowserControlsState current,
     bool animate) {
   m_permittedState = constraints;
 
   DCHECK(!(constraints == WebBrowserControlsShown &&
            current == WebBrowserControlsHidden));
@@ skipping 16 matching lines @@
   else
     setShownRatio(1.f);
 }
 
 void BrowserControls::setHeight(float height, bool shrinkViewport) {
   if (m_height == height && m_shrinkViewport == shrinkViewport)
     return;
 
   m_height = height;
   m_shrinkViewport = shrinkViewport;
-  m_frameHost->page().chromeClient().didUpdateBrowserControls();
+  m_page->chromeClient().didUpdateBrowserControls();
 }
 
 }  // namespace blink