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

Unified Diff: Source/platform/scroll/Scrollbar.cpp

Issue 1158673006: Replace various ScrollableArea scroll methods with setScrollPosition (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Build fix Created 5 years, 6 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/platform/scroll/ScrollableAreaTest.cpp ('k') | Source/web/ResizeViewportAnchor.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/scroll/Scrollbar.cpp
diff --git a/Source/platform/scroll/Scrollbar.cpp b/Source/platform/scroll/Scrollbar.cpp
index 86bc7900dbb225d01ef881f6232c05b67a30fe76..817adba06c033c201cd86c64c38a46a384ad4e03 100644
--- a/Source/platform/scroll/Scrollbar.cpp
+++ b/Source/platform/scroll/Scrollbar.cpp
@@ -297,7 +297,7 @@ void Scrollbar::moveThumb(int pos, bool draggingDocument)
FloatPoint currentPosition = m_scrollableArea->scrollAnimator()->currentPosition();
float destinationPosition = (m_orientation == HorizontalScrollbar ? currentPosition.x() : currentPosition.y()) + delta;
destinationPosition = m_scrollableArea->clampScrollPosition(m_orientation, destinationPosition);
- m_scrollableArea->scrollToOffsetWithoutAnimation(m_orientation, destinationPosition);
+ m_scrollableArea->setScrollPositionSingleAxis(m_orientation, destinationPosition, UserScroll);
m_documentDragPos = pos;
return;
}
@@ -320,7 +320,7 @@ void Scrollbar::moveThumb(int pos, bool draggingDocument)
float maxPos = m_scrollableArea->maximumScrollPosition(m_orientation);
if (delta) {
float newPosition = static_cast<float>(thumbPos + delta) * (maxPos - minPos) / (trackLen - thumbLen) + minPos;
- m_scrollableArea->scrollToOffsetWithoutAnimation(m_orientation, newPosition);
+ m_scrollableArea->setScrollPositionSingleAxis(m_orientation, newPosition, UserScroll);
}
}
@@ -395,8 +395,9 @@ void Scrollbar::mouseMoved(const PlatformMouseEvent& evt)
{
if (m_pressedPart == ThumbPart) {
if (theme()->shouldSnapBackToDragOrigin(this, evt)) {
- if (m_scrollableArea)
- m_scrollableArea->scrollToOffsetWithoutAnimation(m_orientation, m_dragOrigin + m_scrollableArea->minimumScrollPosition(m_orientation));
+ if (m_scrollableArea) {
+ m_scrollableArea->setScrollPositionSingleAxis(m_orientation, m_dragOrigin + m_scrollableArea->minimumScrollPosition(m_orientation), UserScroll);
+ }
} else {
moveThumb(m_orientation == HorizontalScrollbar ?
convertFromContainingWindow(evt.position()).x() :
« no previous file with comments | « Source/platform/scroll/ScrollableAreaTest.cpp ('k') | Source/web/ResizeViewportAnchor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698