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

Unified Diff: Source/core/frame/FrameView.cpp

Issue 977663002: Mac: Delete now-dead elastic overscroll code (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « Source/core/frame/FrameView.h ('k') | Source/platform/blink_platform.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/FrameView.cpp
diff --git a/Source/core/frame/FrameView.cpp b/Source/core/frame/FrameView.cpp
index 06ced1cd8d714bdc1730e2be88a5951c95906581..92b34fc01f502de4634a5edf4068e4ca5c771bf8 100644
--- a/Source/core/frame/FrameView.cpp
+++ b/Source/core/frame/FrameView.cpp
@@ -145,9 +145,6 @@ FrameView::FrameView(LocalFrame* frame)
if (!m_frame->isMainFrame())
return;
-
- ScrollableArea::setVerticalScrollElasticity(ScrollElasticityAllowed);
- ScrollableArea::setHorizontalScrollElasticity(ScrollElasticityAllowed);
}
PassRefPtrWillBeRawPtr<FrameView> FrameView::create(LocalFrame* frame)
@@ -1304,7 +1301,6 @@ void FrameView::removeViewportConstrainedObject(LayoutObject* object)
LayoutRect FrameView::viewportConstrainedVisibleContentRect() const
{
LayoutRect viewportRect = LayoutRect(visibleContentRect());
- // Ignore overhang. No-op when not using rubber banding.
viewportRect.setLocation(clampScrollPosition(scrollPosition()));
return viewportRect;
}
@@ -1746,24 +1742,6 @@ void FrameView::updateCompositedSelectionBoundsIfNeeded()
page->chrome().client().updateCompositedSelectionBounds(start, end);
}
-bool FrameView::isRubberBandInProgress() const
-{
- if (scrollbarsSuppressed())
- return false;
-
- // 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::rubberBandingOnCompositorThread() const
-{
- return m_frame->settings()->rubberBandingOnCompositorThread();
-}
-
HostWindow* FrameView::hostWindow() const
{
Page* page = frame().page();
@@ -2995,12 +2973,8 @@ void FrameView::removeChild(Widget* child)
ScrollResult FrameView::wheelEvent(const PlatformWheelEvent& wheelEvent)
{
- // Note that to allow for rubber-band over-scroll behavior, even non-scrollable views
- // should handle wheel events.
-#if !USE(RUBBER_BANDING)
if (!isScrollable())
return ScrollResult(false);
-#endif
if (m_frame->settings()->rootLayerScrolls())
return ScrollResult(false);
@@ -3581,8 +3555,7 @@ void FrameView::setScrollOffsetFromUpdateScrollbars(const DoubleSize& offset)
{
DoublePoint adjustedScrollPosition = DoublePoint(offset);
- if (!isRubberBandInProgress())
- adjustedScrollPosition = adjustScrollPositionWithinRange(adjustedScrollPosition);
+ adjustedScrollPosition = adjustScrollPositionWithinRange(adjustedScrollPosition);
if (adjustedScrollPosition != scrollPositionDouble() || scrollOriginChanged()) {
ScrollableArea::scrollToOffsetWithoutAnimation(toFloatPoint(adjustedScrollPosition));
« no previous file with comments | « Source/core/frame/FrameView.h ('k') | Source/platform/blink_platform.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698