Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(585)

Unified Diff: third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp

Issue 2742673002: Remove FrameHost::globalRootScrollerController() (Closed)
Patch Set: Rebase Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp
diff --git a/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp b/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp
index 7a2393b1e1a622e147f0187378c77571ca4136a5..291ea69ec6a4b0d4fd5d516cae3f9155a72e388a 100644
--- a/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp
@@ -172,7 +172,7 @@ void PaintLayerScrollableArea::dispose() {
box()
.document()
- .frameHost()
+ .page()
->globalRootScrollerController()
.didDisposeScrollableArea(*this);
@@ -508,10 +508,10 @@ IntSize PaintLayerScrollableArea::maximumScrollOffsetInt() const {
IntSize visibleSize =
pixelSnappedIntRect(box().overflowClipRect(box().location())).size();
- FrameHost* host = layoutBox()->document().frameHost();
- DCHECK(host);
+ Page* page = layoutBox()->document().page();
+ DCHECK(page);
TopDocumentRootScrollerController& controller =
- host->globalRootScrollerController();
+ page->globalRootScrollerController();
// The global root scroller should be clipped by the top FrameView rather
// than it's overflow clipping box. This is to ensure that content exposed by
@@ -1898,7 +1898,7 @@ bool PaintLayerScrollableArea::visualViewportSuppliesScrollbars() const {
return false;
const TopDocumentRootScrollerController& controller =
- layoutBox()->document().frameHost()->globalRootScrollerController();
+ layoutBox()->document().page()->globalRootScrollerController();
return RootScrollerUtil::scrollableAreaForRootScroller(
controller.globalRootScroller()) == this;

Powered by Google App Engine
This is Rietveld 408576698