Chromium Code Reviews

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

Issue 12279017: Revert 140571 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
« no previous file with comments | « Source/WebCore/page/FrameView.h ('k') | Source/WebCore/page/scrolling/ScrollingCoordinator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/page/FrameView.cpp
===================================================================
--- Source/WebCore/page/FrameView.cpp (revision 143052)
+++ Source/WebCore/page/FrameView.cpp (working copy)
@@ -1914,28 +1914,6 @@
return page->chrome()->client()->shouldRubberBandInDirection(direction);
}
-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())
- return scrollAnimator->isRubberBandInProgress();
-
- return false;
-}
-
bool FrameView::requestScrollPositionUpdate(const IntPoint& position)
{
#if ENABLE(THREADED_SCROLLING)
« no previous file with comments | « Source/WebCore/page/FrameView.h ('k') | Source/WebCore/page/scrolling/ScrollingCoordinator.h » ('j') | no next file with comments »

Powered by Google App Engine