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

Unified Diff: cc/scrollbar_animation_controller.cc

Issue 11366089: cc: Remove all remaining use of WebCore Rect/Point/Size types from the compositor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove gyp entries for stubs Created 8 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
« no previous file with comments | « cc/scrollbar_animation_controller.h ('k') | cc/scrollbar_animation_controller_linear_fade.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/scrollbar_animation_controller.cc
diff --git a/cc/scrollbar_animation_controller.cc b/cc/scrollbar_animation_controller.cc
index 7335e2c3a1855626743299657b4e44dc83c67202..5a603945908426b41b48a55ccf8eb6fc91cd7f04 100644
--- a/cc/scrollbar_animation_controller.cc
+++ b/cc/scrollbar_animation_controller.cc
@@ -77,20 +77,20 @@ gfx::Size ScrollbarAnimationController::getScrollLayerBounds(const LayerImpl* sc
void ScrollbarAnimationController::updateScrollOffsetAtTime(LayerImpl* scrollLayer, double)
{
- m_currentPos = scrollLayer->scrollPosition() + scrollLayer->scrollDelta();
+ m_currentOffset = scrollLayer->scrollOffset() + scrollLayer->scrollDelta();
m_totalSize = getScrollLayerBounds(scrollLayer);
- m_maximum = scrollLayer->maxScrollPosition();
+ m_maximum = scrollLayer->maxScrollOffset();
if (m_horizontalScrollbarLayer) {
- m_horizontalScrollbarLayer->setCurrentPos(m_currentPos.x());
+ m_horizontalScrollbarLayer->setCurrentPos(m_currentOffset.x());
m_horizontalScrollbarLayer->setTotalSize(m_totalSize.width());
- m_horizontalScrollbarLayer->setMaximum(m_maximum.width());
+ m_horizontalScrollbarLayer->setMaximum(m_maximum.x());
}
if (m_verticalScrollbarLayer) {
- m_verticalScrollbarLayer->setCurrentPos(m_currentPos.y());
+ m_verticalScrollbarLayer->setCurrentPos(m_currentOffset.y());
m_verticalScrollbarLayer->setTotalSize(m_totalSize.height());
- m_verticalScrollbarLayer->setMaximum(m_maximum.height());
+ m_verticalScrollbarLayer->setMaximum(m_maximum.y());
}
}
« no previous file with comments | « cc/scrollbar_animation_controller.h ('k') | cc/scrollbar_animation_controller_linear_fade.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698