Move FrameHost::m_globalRootScrollerController to Page

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

Index: third_party/WebKit/Source/core/page/Page.h
diff --git a/third_party/WebKit/Source/core/page/Page.h b/third_party/WebKit/Source/core/page/Page.h
index ac118b6733cedac954175e24743bb703c68f61e6..55371db0a4aa1347d7365af7260368b644dce3fb 100644
--- a/third_party/WebKit/Source/core/page/Page.h
+++ b/third_party/WebKit/Source/core/page/Page.h
@@ -48,6 +48,7 @@ namespace blink {
 
 class AutoscrollController;
 class BrowserControls;
+class TopDocumentRootScrollerController;

[slangley, 2017/03/09 04:18:28]

nit: sort

[sashab, 2017/03/09 04:27:46]

Ty, weird how git cl format didn't do that.

 class ChromeClient;
 class ClientRectList;
 class ContextMenuClient;
@@ -189,6 +190,8 @@ class CORE_EXPORT Page final : public GarbageCollectedFinalized<Page>,
   BrowserControls& browserControls();
   const BrowserControls& browserControls() const;
 
+  TopDocumentRootScrollerController& globalRootScrollerController() const;

[slangley, 2017/03/09 04:18:28]

why not inline?

[sashab, 2017/03/09 04:27:46]

Prevent a #include? Copied from Page where it wasn't inline.

+
   void setTabKeyCyclesThroughElements(bool b) {
     m_tabKeyCyclesThroughElements = b;
   }
@@ -275,6 +278,8 @@ class CORE_EXPORT Page final : public GarbageCollectedFinalized<Page>,
   const Member<PointerLockController> m_pointerLockController;
   Member<ScrollingCoordinator> m_scrollingCoordinator;
   const Member<BrowserControls> m_browserControls;
+  const Member<TopDocumentRootScrollerController>
+      m_globalRootScrollerController;
 
   // Typically, the main frame and Page should both be owned by the embedder,
   // which must call Page::willBeDestroyed() prior to destroying Page. This