Move FrameHost::m_globalRootScrollerController to Page

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

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 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 30 matching lines @@
 #include "platform/heap/Handle.h"
 #include "wtf/Forward.h"
 #include "wtf/HashSet.h"
 #include "wtf/Noncopyable.h"
 #include "wtf/text/WTFString.h"
 
 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;
 class ContextMenuController;
 class Document;
 class DragCaret;
 class DragController;
 class EditorClient;
 class FocusController;
 class Frame;
@@ skipping 121 matching lines @@
   UseCounter& useCounter() { return m_useCounter; }
   Deprecation& deprecation() { return m_deprecation; }
   HostsUsingFeatures& hostsUsingFeatures() { return m_hostsUsingFeatures; }
 
   PageScaleConstraintsSet& pageScaleConstraintsSet();
   const PageScaleConstraintsSet& pageScaleConstraintsSet() const;
 
   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;
   }
   bool tabKeyCyclesThroughElements() const {
     return m_tabKeyCyclesThroughElements;
   }
 
   // Suspension is used to implement the "Optionally, pause while waiting for
   // the user to acknowledge the message" step of simple dialog processing:
   // https://html.spec.whatwg.org/multipage/webappapis.html#simple-dialogs
@@ skipping 66 matching lines @@
   const Member<AutoscrollController> m_autoscrollController;
   Member<ChromeClient> m_chromeClient;
   const Member<DragCaret> m_dragCaret;
   const Member<DragController> m_dragController;
   const Member<FocusController> m_focusController;
   const Member<ContextMenuController> m_contextMenuController;
   const std::unique_ptr<PageScaleConstraintsSet> m_pageScaleConstraintsSet;
   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
   // call detaches the main frame and clears this pointer, thus ensuring that
   // this field only references a live main frame.
   //
   // However, there are several locations (InspectorOverlay, SVGImage, and
   // WebPagePopupImpl) which don't hold a reference to the main frame at all
   // after creating it. These are still safe because they always create a
   // Frame with a FrameView. FrameView and Frame hold references to each
@@ skipping 37 matching lines @@
   // Page.
   // FIXME: Most of the members of Page should move onto FrameHost.
   Member<FrameHost> m_frameHost;
 };
 
 extern template class CORE_EXTERN_TEMPLATE_EXPORT Supplement<Page>;
 
 }  // namespace blink
 
 #endif  // Page_h