Move TopDocumentRootScrollerController to a separate object on FrameHost

third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp

 /*
  * Copyright (C) 2009, 2010 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 33 matching lines @@
 #include "core/layout/api/LayoutViewItem.h"
 #include "core/layout/compositing/CompositedLayerMapping.h"
 #include "core/layout/compositing/CompositingInputsUpdater.h"
 #include "core/layout/compositing/CompositingLayerAssigner.h"
 #include "core/layout/compositing/CompositingRequirementsUpdater.h"
 #include "core/layout/compositing/GraphicsLayerTreeBuilder.h"
 #include "core/layout/compositing/GraphicsLayerUpdater.h"
 #include "core/loader/FrameLoaderClient.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/Page.h"
-#include "core/page/scrolling/RootScrollerController.h"
 #include "core/page/scrolling/ScrollingCoordinator.h"
+#include "core/page/scrolling/TopDocumentRootScrollerController.h"
 #include "core/paint/FramePainter.h"
 #include "core/paint/ObjectPaintInvalidator.h"
 #include "core/paint/TransformRecorder.h"
 #include "platform/Histogram.h"
 #include "platform/JSONValues.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/ScriptForbiddenScope.h"
 #include "platform/TraceEvent.h"
 #include "platform/geometry/FloatRect.h"
 #include "platform/graphics/CompositorMutableProperties.h"
@@ skipping 180 matching lines @@
     lifecycle().advanceTo(DocumentLifecycle::CompositingClean);
 
     DocumentAnimations::updateCompositorAnimations(m_layoutView.document());
 
     m_layoutView.frameView()->getScrollableArea()->updateCompositorScrollAnimations();
     if (const FrameView::ScrollableAreaSet* animatingScrollableAreas = m_layoutView.frameView()->animatingScrollableAreas()) {
         for (ScrollableArea* scrollableArea : *animatingScrollableAreas)
             scrollableArea->updateCompositorScrollAnimations();
     }
 
-    m_layoutView.document().rootScrollerController()->didUpdateCompositing();
 #if ENABLE(ASSERT)
     ASSERT(lifecycle().state() == DocumentLifecycle::CompositingClean);
     assertNoUnresolvedDirtyBits();
     for (Frame* child = m_layoutView.frameView()->frame().tree().firstChild(); child; child = child->tree().nextSibling()) {
         if (!child->isLocalFrame())
             continue;
         LocalFrame* localFrame = toLocalFrame(child);
         if (localFrame->shouldThrottleRendering() || localFrame->contentLayoutItem().isNull())
             continue;
         localFrame->contentLayoutItem().compositor()->assertNoUnresolvedDirtyBits();
@@ skipping 197 matching lines @@
     if (m_layoutView.frame()->isMainFrame())
         InspectorInstrumentation::layerTreeDidChange(m_layoutView.frame());
 }
 
 void PaintLayerCompositor::setClippingOnRootScrollerAncestors()
 {
     bool shouldClip = !rootLayer()->hasRootScrollerAsDescendant();
     if (m_rootContentLayer)
         m_rootContentLayer->setMasksToBounds(shouldClip);
 
-    RootScrollerController* topRootScrollerController =
-        m_layoutView.document().topDocument().rootScrollerController();
+    TopDocumentRootScrollerController& globalRootScrollerController =

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

const?

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

Done.

+        m_layoutView.document().frameHost()->globalRootScrollerController();
     bool frameIsRootScroller =
-        topRootScrollerController->rootScrollerLayer() == scrollLayer();
+        globalRootScrollerController.rootScrollerLayer() == scrollLayer();
 
     // We normally clip iframes' (but not the root frame) overflow controls
     // host and container layers but if the root scroller is the iframe itself
     // we want it to behave like the root frame.
     shouldClip &= !frameIsRootScroller && !m_layoutView.frame()->isLocalRoot();
 
     if (m_containerLayer)
         m_containerLayer->setMasksToBounds(shouldClip);
     if (m_overflowControlsHostLayer)
         m_overflowControlsHostLayer->setMasksToBounds(shouldClip);
@@ skipping 779 matching lines @@
     } else if (graphicsLayer == m_scrollLayer.get()) {
         name = "Frame Scrolling Layer";
     } else {
         ASSERT_NOT_REACHED();
     }
 
     return name;
 }
 
 } // namespace blink