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

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

Issue 2454913003: MainFrame scrollbars should work with RFV instead of FV (Closed)
Patch Set: Fix broken chromeos bot Created 4 years, 1 month 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/platform/scroll/Scrollbar.cpp
diff --git a/third_party/WebKit/Source/platform/scroll/Scrollbar.cpp b/third_party/WebKit/Source/platform/scroll/Scrollbar.cpp
index 516eed533a8be643ee4b9a1c0b32f7df95180df5..daf1e3d2fdead90e7713d7393766aa3a8e82a931 100644
--- a/third_party/WebKit/Source/platform/scroll/Scrollbar.cpp
+++ b/third_party/WebKit/Source/platform/scroll/Scrollbar.cpp
@@ -253,8 +253,7 @@ void Scrollbar::moveThumb(int pos, bool draggingDocument) {
if (m_draggingDocument)
delta = pos - m_documentDragPos;
m_draggingDocument = true;
- ScrollOffset currentPosition =
- m_scrollableArea->scrollAnimator().currentOffset();
+ ScrollOffset currentPosition = m_scrollableArea->scrollOffset();
float destinationPosition =
(m_orientation == HorizontalScrollbar ? currentPosition.width()
: currentPosition.height()) +
@@ -605,11 +604,11 @@ float Scrollbar::scrollableAreaTargetPos() const {
return 0;
if (m_orientation == HorizontalScrollbar) {
- return m_scrollableArea->scrollAnimator().desiredTargetOffset().width() -
+ return m_scrollableArea->scrollAnimatorDesiredTargetOffset().width() -
m_scrollableArea->minimumScrollOffset().width();
}
- return m_scrollableArea->scrollAnimator().desiredTargetOffset().height() -
+ return m_scrollableArea->scrollAnimatorDesiredTargetOffset().height() -
m_scrollableArea->minimumScrollOffset().height();
}

Powered by Google App Engine
This is Rietveld 408576698