Index: third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp |
diff --git a/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp b/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp |
index 57c10fd8d9f9c884360f031eda8b1ea6695ecb49..c5b7ac53e8316ce2607876e2bf9f1eb2f5c64cfd 100644 |
--- a/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp |
+++ b/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp |
@@ -51,8 +51,8 @@ |
#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" |
@@ -253,7 +253,6 @@ void PaintLayerCompositor::updateIfNeededRecursiveInternal() |
scrollableArea->updateCompositorScrollAnimations(); |
} |
- m_layoutView.document().rootScrollerController()->didUpdateCompositing(); |
#if ENABLE(ASSERT) |
ASSERT(lifecycle().state() == DocumentLifecycle::CompositingClean); |
assertNoUnresolvedDirtyBits(); |
@@ -471,10 +470,10 @@ void PaintLayerCompositor::setClippingOnRootScrollerAncestors() |
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 |