summaryrefslogtreecommitdiffstats
path: root/cc/scrollbar_animation_controller.cc
diff options
context:
space:
mode:
authorenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-22 23:09:55 +0000
committerenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-22 23:09:55 +0000
commit96baf3e81b1df4b0836d70c3cded9795e63fa789 (patch)
tree4332d128a05777ae34641ca2f185b7b548330b8d /cc/scrollbar_animation_controller.cc
parent1597399122fa6d8343dc6d5cdb771f95908c09b1 (diff)
downloadchromium_src-96baf3e81b1df4b0836d70c3cded9795e63fa789.zip
chromium_src-96baf3e81b1df4b0836d70c3cded9795e63fa789.tar.gz
chromium_src-96baf3e81b1df4b0836d70c3cded9795e63fa789.tar.bz2
cc: Rename cc classes and members to match filenames
Fixed reland of https://chromiumcodereview.appspot.com/11189043/ TBR=jam@chromium.org,jamesr@chromium.org BUG=155413 Review URL: https://codereview.chromium.org/11231054 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163429 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/scrollbar_animation_controller.cc')
-rw-r--r--cc/scrollbar_animation_controller.cc30
1 files changed, 15 insertions, 15 deletions
diff --git a/cc/scrollbar_animation_controller.cc b/cc/scrollbar_animation_controller.cc
index 33dee8b..764f069 100644
--- a/cc/scrollbar_animation_controller.cc
+++ b/cc/scrollbar_animation_controller.cc
@@ -16,66 +16,66 @@
namespace cc {
#if OS(ANDROID)
-scoped_ptr<CCScrollbarAnimationController> CCScrollbarAnimationController::create(CCLayerImpl* scrollLayer)
+scoped_ptr<ScrollbarAnimationController> ScrollbarAnimationController::create(LayerImpl* scrollLayer)
{
static const double fadeoutDelay = 0.3;
static const double fadeoutLength = 0.3;
- return CCScrollbarAnimationControllerLinearFade::create(scrollLayer, fadeoutDelay, fadeoutLength).PassAs<CCScrollbarAnimationController>();
+ return ScrollbarAnimationControllerLinearFade::create(scrollLayer, fadeoutDelay, fadeoutLength).PassAs<ScrollbarAnimationController>();
}
#else
-scoped_ptr<CCScrollbarAnimationController> CCScrollbarAnimationController::create(CCLayerImpl* scrollLayer)
+scoped_ptr<ScrollbarAnimationController> ScrollbarAnimationController::create(LayerImpl* scrollLayer)
{
- return make_scoped_ptr(new CCScrollbarAnimationController(scrollLayer));
+ return make_scoped_ptr(new ScrollbarAnimationController(scrollLayer));
}
#endif
-CCScrollbarAnimationController::CCScrollbarAnimationController(CCLayerImpl* scrollLayer)
+ScrollbarAnimationController::ScrollbarAnimationController(LayerImpl* scrollLayer)
: m_horizontalScrollbarLayer(0)
, m_verticalScrollbarLayer(0)
{
- CCScrollbarAnimationController::updateScrollOffsetAtTime(scrollLayer, 0);
+ ScrollbarAnimationController::updateScrollOffsetAtTime(scrollLayer, 0);
}
-CCScrollbarAnimationController::~CCScrollbarAnimationController()
+ScrollbarAnimationController::~ScrollbarAnimationController()
{
}
-bool CCScrollbarAnimationController::animate(double)
+bool ScrollbarAnimationController::animate(double)
{
return false;
}
-void CCScrollbarAnimationController::didPinchGestureBegin()
+void ScrollbarAnimationController::didPinchGestureBegin()
{
didPinchGestureBeginAtTime((base::TimeTicks::Now() - base::TimeTicks()).InSecondsF());
}
-void CCScrollbarAnimationController::didPinchGestureUpdate()
+void ScrollbarAnimationController::didPinchGestureUpdate()
{
didPinchGestureUpdateAtTime((base::TimeTicks::Now() - base::TimeTicks()).InSecondsF());
}
-void CCScrollbarAnimationController::didPinchGestureEnd()
+void ScrollbarAnimationController::didPinchGestureEnd()
{
didPinchGestureEndAtTime((base::TimeTicks::Now() - base::TimeTicks()).InSecondsF());
}
-void CCScrollbarAnimationController::updateScrollOffset(CCLayerImpl* scrollLayer)
+void ScrollbarAnimationController::updateScrollOffset(LayerImpl* scrollLayer)
{
updateScrollOffsetAtTime(scrollLayer, (base::TimeTicks::Now() - base::TimeTicks()).InSecondsF());
}
-IntSize CCScrollbarAnimationController::getScrollLayerBounds(const CCLayerImpl* scrollLayer)
+IntSize ScrollbarAnimationController::getScrollLayerBounds(const LayerImpl* scrollLayer)
{
if (!scrollLayer->children().size())
return IntSize();
- // Copy & paste from CCLayerTreeHostImpl...
+ // Copy & paste from LayerTreeHostImpl...
// FIXME: Hardcoding the first child here is weird. Think of
// a cleaner way to get the contentBounds on the Impl side.
return scrollLayer->children()[0]->bounds();
}
-void CCScrollbarAnimationController::updateScrollOffsetAtTime(CCLayerImpl* scrollLayer, double)
+void ScrollbarAnimationController::updateScrollOffsetAtTime(LayerImpl* scrollLayer, double)
{
m_currentPos = scrollLayer->scrollPosition() + scrollLayer->scrollDelta();
m_totalSize = getScrollLayerBounds(scrollLayer);