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

Unified Diff: Source/WebCore/page/FrameView.cpp

Issue 13665002: Fold ScrollingCoordinatorChromium into ScrollingCoordinator and devirtualize (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 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: Source/WebCore/page/FrameView.cpp
diff --git a/Source/WebCore/page/FrameView.cpp b/Source/WebCore/page/FrameView.cpp
index aede9ee9dc3cc586aa2f10bd034ad7f970e784c5..485bd41868a374c6d5ceac2fb9994fbfa0017706 100644
--- a/Source/WebCore/page/FrameView.cpp
+++ b/Source/WebCore/page/FrameView.cpp
@@ -839,19 +839,6 @@ TiledBacking* FrameView::tiledBacking()
return backing->graphicsLayer()->tiledBacking();
}
-uint64_t FrameView::scrollLayerID() const
-{
- RenderView* renderView = this->renderView();
- if (!renderView)
- return 0;
-
- RenderLayerBacking* backing = renderView->layer()->backing();
- if (!backing)
- return 0;
-
- return backing->scrollLayerID();
-}
-
#if ENABLE(RUBBER_BANDING)
GraphicsLayer* FrameView::layerForOverhangAreas() const
{
@@ -2037,15 +2024,6 @@ bool FrameView::isRubberBandInProgress() const
if (scrollbarsSuppressed())
return false;
- // If the scrolling thread updates the scroll position for this FrameView, then we should return
- // ScrollingCoordinator::isRubberBandInProgress().
- if (Page* page = m_frame->page()) {
- if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordinator()) {
- if (!scrollingCoordinator->shouldUpdateScrollLayerPositionOnMainThread())
- return scrollingCoordinator->isRubberBandInProgress();
- }
- }
-
// If the main thread updates the scroll position for this FrameView, we should return
// ScrollAnimator::isRubberBandInProgress().
if (ScrollAnimator* scrollAnimator = existingScrollAnimator())

Powered by Google App Engine
This is Rietveld 408576698