Move TopDocumentRootScrollerController to a separate object on FrameHost

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

Index: third_party/WebKit/Source/core/frame/FrameHost.h
diff --git a/third_party/WebKit/Source/core/frame/FrameHost.h b/third_party/WebKit/Source/core/frame/FrameHost.h
index 300f2040235b7a3dc1a3210cecd075689dcbe19f..5480fad5c88d57db5353ede1fd58634989d04445 100644
--- a/third_party/WebKit/Source/core/frame/FrameHost.h
+++ b/third_party/WebKit/Source/core/frame/FrameHost.h
@@ -50,6 +50,7 @@ struct PageScaleConstraints;
 class PageScaleConstraintsSet;
 class Settings;
 class TopControls;
+class TopDocumentRootScrollerController;
 class UseCounter;
 class Visitor;
 class VisualViewport;
@@ -116,6 +117,8 @@ public:
     ConsoleMessageStorage& consoleMessageStorage();
     const ConsoleMessageStorage& consoleMessageStorage() const;
 
+    TopDocumentRootScrollerController& globalRootScrollerController() const;
+
     DECLARE_TRACE();
 
     // Don't allow more than a certain number of frames in a page.
@@ -140,6 +143,7 @@ private:
     const Member<OverscrollController> m_overscrollController;
     const Member<EventHandlerRegistry> m_eventHandlerRegistry;
     const Member<ConsoleMessageStorage> m_consoleMessageStorage;
+    Member<TopDocumentRootScrollerController> m_globalRootScrollerController;

[tdresser, 2016/08/30 15:05:30]

Should this be const?

[bokan, 2016/08/30 16:13:39]

Done.

 
     AtomicString m_overrideEncoding;
     int m_subframeCount;