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 235 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 201 matching lines @@
 void PaintLayerCompositor::updateClippingOnCompositorLayers()
 {
     bool shouldClip = !rootLayer()->hasRootScrollerAsDescendant();
     if (m_rootContentLayer) {
         // FIXME: with rootLayerScrolls, we probably don't even need
         // m_rootContentLayer?
         m_rootContentLayer->setMasksToBounds(
             !RuntimeEnabledFeatures::rootLayerScrollingEnabled() && shouldClip);
     }
 
-    // TODO(bokan): Temporary hack-cast to TDRSC until the follow-up patch
-    // lands and we can get a pointer to a TopDocumentRootScrollerController
-    // legitimately.
-    TopDocumentRootScrollerController* globalRootScrollerController =
-        (TopDocumentRootScrollerController*)m_layoutView.document().topDocument().rootScrollerController();
+    const TopDocumentRootScrollerController& globalRootScrollerController =
+        m_layoutView.document().frameHost()->globalRootScrollerController();
 
     Element* documentElement = m_layoutView.document().documentElement();
     bool frameIsRootScroller = documentElement && documentElement->isSameNode(
-        globalRootScrollerController->globalRootScroller());
+        globalRootScrollerController.globalRootScroller());
 
     // 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 773 matching lines @@
     } else if (graphicsLayer == m_scrollLayer.get()) {
         name = "Frame Scrolling Layer";
     } else {
         ASSERT_NOT_REACHED();
     }
 
     return name;
 }
 
 } // namespace blink