Move FrameHost::m_browserControls to Page

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

 /*
  * Copyright (C) 2013 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 12 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 "core/frame/FrameHost.h"
 
-#include "core/frame/BrowserControls.h"
 #include "core/frame/EventHandlerRegistry.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/VisualViewport.h"
 #include "core/inspector/ConsoleMessageStorage.h"
 #include "core/page/Page.h"
 #include "core/page/scrolling/OverscrollController.h"
 #include "core/page/scrolling/TopDocumentRootScrollerController.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebScheduler.h"
 
 namespace blink {
 
 FrameHost* FrameHost::create(Page& page) {
   return new FrameHost(page);
 }
 
 FrameHost::FrameHost(Page& page)
     : m_page(&page),
-      m_browserControls(BrowserControls::create(page)),
       m_visualViewport(VisualViewport::create(*this)),
       m_overscrollController(
           OverscrollController::create(*m_visualViewport,
                                        m_page->chromeClient())),
       m_eventHandlerRegistry(new EventHandlerRegistry(*this)),
       m_consoleMessageStorage(new ConsoleMessageStorage()),
       m_globalRootScrollerController(
           TopDocumentRootScrollerController::create(*this)),
       m_subframeCount(0) {}
 
 // Explicitly in the .cpp to avoid default constructor in .h
 FrameHost::~FrameHost() {}
 
 Page& FrameHost::page() {
   return *m_page;
 }
 
 const Page& FrameHost::page() const {
   return *m_page;
 }
 
 BrowserControls& FrameHost::browserControls() {
-  return *m_browserControls;
+  return m_page->browserControls();
 }
 
 const BrowserControls& FrameHost::browserControls() const {
-  return *m_browserControls;
+  return m_page->browserControls();
 }
 
 OverscrollController& FrameHost::overscrollController() {
   return *m_overscrollController;
 }
 
 const OverscrollController& FrameHost::overscrollController() const {
   return *m_overscrollController;
 }
 
@@ skipping 29 matching lines @@
   return *m_consoleMessageStorage;
 }
 
 TopDocumentRootScrollerController& FrameHost::globalRootScrollerController()
     const {
   return *m_globalRootScrollerController;
 }
 
 DEFINE_TRACE(FrameHost) {
   visitor->trace(m_page);
-  visitor->trace(m_browserControls);
   visitor->trace(m_visualViewport);
   visitor->trace(m_overscrollController);
   visitor->trace(m_eventHandlerRegistry);
   visitor->trace(m_consoleMessageStorage);
   visitor->trace(m_globalRootScrollerController);
 }
 
 #if DCHECK_IS_ON()
 void checkFrameCountConsistency(int expectedFrameCount, Frame* frame) {
   ASSERT(expectedFrameCount >= 0);
 
   int actualFrameCount = 0;
   for (; frame; frame = frame->tree().traverseNext())
     ++actualFrameCount;
 
   ASSERT(expectedFrameCount == actualFrameCount);
 }
 #endif
 
 int FrameHost::subframeCount() const {
 #if DCHECK_IS_ON()
   checkFrameCountConsistency(m_subframeCount + 1, m_page->mainFrame());
 #endif
   return m_subframeCount;
 }
 
 }  // namespace blink