OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "config.h" | 5 #include "config.h" |
6 | 6 |
7 #include "CCScrollbarAnimationController.h" | 7 #include "CCScrollbarAnimationController.h" |
8 | 8 |
9 #include "CCScrollbarLayerImpl.h" | 9 #include "CCScrollbarLayerImpl.h" |
10 #include <wtf/CurrentTime.h> | 10 #include <wtf/CurrentTime.h> |
(...skipping 22 matching lines...) Expand all Loading... |
33 : m_horizontalScrollbarLayer(0) | 33 : m_horizontalScrollbarLayer(0) |
34 , m_verticalScrollbarLayer(0) | 34 , m_verticalScrollbarLayer(0) |
35 { | 35 { |
36 CCScrollbarAnimationController::updateScrollOffsetAtTime(scrollLayer, 0); | 36 CCScrollbarAnimationController::updateScrollOffsetAtTime(scrollLayer, 0); |
37 } | 37 } |
38 | 38 |
39 CCScrollbarAnimationController::~CCScrollbarAnimationController() | 39 CCScrollbarAnimationController::~CCScrollbarAnimationController() |
40 { | 40 { |
41 } | 41 } |
42 | 42 |
| 43 bool CCScrollbarAnimationController::animate(double) |
| 44 { |
| 45 return false; |
| 46 } |
| 47 |
43 void CCScrollbarAnimationController::didPinchGestureBegin() | 48 void CCScrollbarAnimationController::didPinchGestureBegin() |
44 { | 49 { |
45 didPinchGestureBeginAtTime(monotonicallyIncreasingTime()); | 50 didPinchGestureBeginAtTime(monotonicallyIncreasingTime()); |
46 } | 51 } |
47 | 52 |
48 void CCScrollbarAnimationController::didPinchGestureUpdate() | 53 void CCScrollbarAnimationController::didPinchGestureUpdate() |
49 { | 54 { |
50 didPinchGestureUpdateAtTime(monotonicallyIncreasingTime()); | 55 didPinchGestureUpdateAtTime(monotonicallyIncreasingTime()); |
51 } | 56 } |
52 | 57 |
(...skipping 30 matching lines...) Expand all Loading... |
83 } | 88 } |
84 | 89 |
85 if (m_verticalScrollbarLayer) { | 90 if (m_verticalScrollbarLayer) { |
86 m_verticalScrollbarLayer->setCurrentPos(m_currentPos.y()); | 91 m_verticalScrollbarLayer->setCurrentPos(m_currentPos.y()); |
87 m_verticalScrollbarLayer->setTotalSize(m_totalSize.height()); | 92 m_verticalScrollbarLayer->setTotalSize(m_totalSize.height()); |
88 m_verticalScrollbarLayer->setMaximum(m_maximum.height()); | 93 m_verticalScrollbarLayer->setMaximum(m_maximum.height()); |
89 } | 94 } |
90 } | 95 } |
91 | 96 |
92 } // namespace cc | 97 } // namespace cc |
OLD | NEW |