Move FrameHost::m_browserControls to Page

third_party/WebKit/Source/core/page/Page.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All
  * Rights Reserved.
  * Copyright (C) 2008 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 12 matching lines @@
 
 #include "bindings/core/v8/ScriptController.h"
 #include "core/css/resolver/ViewportStyleResolver.h"
 #include "core/dom/ClientRectList.h"
 #include "core/dom/StyleChangeReason.h"
 #include "core/dom/StyleEngine.h"
 #include "core/dom/VisitedLinkState.h"
 #include "core/editing/DragCaret.h"
 #include "core/editing/markers/DocumentMarkerController.h"
 #include "core/events/Event.h"
+#include "core/frame/BrowserControls.h"
 #include "core/frame/DOMTimer.h"
 #include "core/frame/FrameConsole.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/PageScaleConstraints.h"
 #include "core/frame/PageScaleConstraintsSet.h"
 #include "core/frame/RemoteFrame.h"
 #include "core/frame/RemoteFrameView.h"
 #include "core/frame/Settings.h"
 #include "core/frame/VisualViewport.h"
@@ skipping 53 matching lines @@
       m_animator(PageAnimator::create(*this)),
       m_autoscrollController(AutoscrollController::create(*this)),
       m_chromeClient(pageClients.chromeClient),
       m_dragCaret(DragCaret::create()),
       m_dragController(DragController::create(this)),
       m_focusController(FocusController::create(this)),
       m_contextMenuController(
           ContextMenuController::create(this, pageClients.contextMenuClient)),
       m_pageScaleConstraintsSet(PageScaleConstraintsSet::create()),
       m_pointerLockController(PointerLockController::create(this)),
+      m_browserControls(BrowserControls::create(*this)),
       m_mainFrame(nullptr),
       m_editorClient(pageClients.editorClient),
       m_spellCheckerClient(pageClients.spellCheckerClient),
       m_useCounter(pageClients.chromeClient &&
                            pageClients.chromeClient->isSVGImageChromeClient()
                        ? UseCounter::SVGImageContext
                        : UseCounter::DefaultContext),
       m_openedByDOM(false),
       m_tabKeyCyclesThroughElements(true),
       m_suspended(false),
@@ skipping 38 matching lines @@
 }
 
 PageScaleConstraintsSet& Page::pageScaleConstraintsSet() {
   return *m_pageScaleConstraintsSet;
 }
 
 const PageScaleConstraintsSet& Page::pageScaleConstraintsSet() const {
   return *m_pageScaleConstraintsSet;
 }
 
+BrowserControls& Page::browserControls() {
+  return *m_browserControls;
+}
+
+const BrowserControls& Page::browserControls() const {
+  return *m_browserControls;
+}
+
 ClientRectList* Page::nonFastScrollableRects(const LocalFrame* frame) {
   DisableCompositingQueryAsserts disabler;
   if (ScrollingCoordinator* scrollingCoordinator =
           this->scrollingCoordinator()) {
     // Hits in compositing/iframes/iframe-composited-scrolling.html
     scrollingCoordinator->updateAfterCompositingChangeIfNeeded();
   }
 
   GraphicsLayer* layer =
       frame->view()->layoutViewportScrollableArea()->layerForScrolling();
@@ skipping 358 matching lines @@
 DEFINE_TRACE(Page) {
   visitor->trace(m_animator);
   visitor->trace(m_autoscrollController);
   visitor->trace(m_chromeClient);
   visitor->trace(m_dragCaret);
   visitor->trace(m_dragController);
   visitor->trace(m_focusController);
   visitor->trace(m_contextMenuController);
   visitor->trace(m_pointerLockController);
   visitor->trace(m_scrollingCoordinator);
+  visitor->trace(m_browserControls);
   visitor->trace(m_mainFrame);
   visitor->trace(m_validationMessageClient);
   visitor->trace(m_useCounter);
   visitor->trace(m_frameHost);
   Supplementable<Page>::trace(visitor);
   PageVisibilityNotifier::trace(visitor);
 }
 
 void Page::layerTreeViewInitialized(WebLayerTreeView& layerTreeView,
                                     FrameView* view) {
@@ skipping 31 matching lines @@
     : chromeClient(nullptr),
       contextMenuClient(nullptr),
       editorClient(nullptr),
       spellCheckerClient(nullptr) {}
 
 Page::PageClients::~PageClients() {}
 
 template class CORE_TEMPLATE_EXPORT Supplement<Page>;
 
 }  // namespace blink