Move TopDocumentRootScrollerController to a separate object on FrameHost

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

 /*
  * 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 32 matching lines @@
 class ChromeClient;
 class ConsoleMessageStorage;
 class Deprecation;
 class EventHandlerRegistry;
 class OverscrollController;
 class Page;
 struct PageScaleConstraints;
 class PageScaleConstraintsSet;
 class Settings;
 class TopControls;
+class TopDocumentRootScrollerController;
 class UseCounter;
 class Visitor;
 class VisualViewport;
 
 // FrameHost is the set of global data shared between multiple frames
 // and is provided by the embedder to each frame when created.
 // FrameHost currently corresponds to the Page object in core/page
 // however the concept of a Page is moving up out of Blink.
 // In an out-of-process iframe world, a single Page may have
 // multiple frames in different process, thus Page becomes a
@@ skipping 46 matching lines @@
 
     EventHandlerRegistry& eventHandlerRegistry();
     const EventHandlerRegistry& eventHandlerRegistry() const;
 
     const AtomicString& overrideEncoding() const { return m_overrideEncoding; }
     void setOverrideEncoding(const AtomicString& encoding) { m_overrideEncoding = encoding; }
 
     ConsoleMessageStorage& consoleMessageStorage();
     const ConsoleMessageStorage& consoleMessageStorage() const;
 
+    TopDocumentRootScrollerController& globalRootScrollerController() const;
+
     DECLARE_TRACE();
 
     // Don't allow more than a certain number of frames in a page.
     // This seems like a reasonable upper bound, and otherwise mutually
     // recursive frameset pages can quickly bring the program to its knees
     // with exponential growth in the number of frames.
     static const int maxNumberOfFrames = 1000;
     void incrementSubframeCount() { ++m_subframeCount; }
     void decrementSubframeCount() { ASSERT(m_subframeCount); --m_subframeCount; }
     int subframeCount() const;
 
     void setDefaultPageScaleLimits(float minScale, float maxScale);
     void setUserAgentPageScaleConstraints(const PageScaleConstraints& newConstraints);
 
 private:
     explicit FrameHost(Page&);
 
     const Member<Page> m_page;
     const Member<TopControls> m_topControls;
     const std::unique_ptr<PageScaleConstraintsSet> m_pageScaleConstraintsSet;
     const Member<VisualViewport> m_visualViewport;
     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;
 };
 
 } // namespace blink
 
 #endif // FrameHost_h