summaryrefslogtreecommitdiffstats
path: root/cc/scrollbar_animation_controller_linear_fade.cc
diff options
context:
space:
mode:
authorenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-19 20:58:10 +0000
committerenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-19 20:58:10 +0000
commit184fac5add06d5f4670fa6be4a4d3b39232d51bb (patch)
tree7efc1d20146fcafdbe408fa67292117c41e9393f /cc/scrollbar_animation_controller_linear_fade.cc
parentfb7ffba75e81a79436434bab0715be0d6e67bc07 (diff)
downloadchromium_src-184fac5add06d5f4670fa6be4a4d3b39232d51bb.zip
chromium_src-184fac5add06d5f4670fa6be4a4d3b39232d51bb.tar.gz
chromium_src-184fac5add06d5f4670fa6be4a4d3b39232d51bb.tar.bz2
cc: Rename cc classes and members to match filenames
BUG=155413 Review URL: https://codereview.chromium.org/11189043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163052 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/scrollbar_animation_controller_linear_fade.cc')
-rw-r--r--cc/scrollbar_animation_controller_linear_fade.cc22
1 files changed, 11 insertions, 11 deletions
diff --git a/cc/scrollbar_animation_controller_linear_fade.cc b/cc/scrollbar_animation_controller_linear_fade.cc
index 35b5261..282d19a 100644
--- a/cc/scrollbar_animation_controller_linear_fade.cc
+++ b/cc/scrollbar_animation_controller_linear_fade.cc
@@ -10,13 +10,13 @@
namespace cc {
-scoped_ptr<CCScrollbarAnimationControllerLinearFade> CCScrollbarAnimationControllerLinearFade::create(CCLayerImpl* scrollLayer, double fadeoutDelay, double fadeoutLength)
+scoped_ptr<ScrollbarAnimationControllerLinearFade> ScrollbarAnimationControllerLinearFade::create(LayerImpl* scrollLayer, double fadeoutDelay, double fadeoutLength)
{
- return make_scoped_ptr(new CCScrollbarAnimationControllerLinearFade(scrollLayer, fadeoutDelay, fadeoutLength));
+ return make_scoped_ptr(new ScrollbarAnimationControllerLinearFade(scrollLayer, fadeoutDelay, fadeoutLength));
}
-CCScrollbarAnimationControllerLinearFade::CCScrollbarAnimationControllerLinearFade(CCLayerImpl* scrollLayer, double fadeoutDelay, double fadeoutLength)
- : CCScrollbarAnimationController(scrollLayer)
+ScrollbarAnimationControllerLinearFade::ScrollbarAnimationControllerLinearFade(LayerImpl* scrollLayer, double fadeoutDelay, double fadeoutLength)
+ : ScrollbarAnimationController(scrollLayer)
, m_lastAwakenTime(-100000000) // arbitrary invalid timestamp
, m_pinchGestureInEffect(false)
, m_fadeoutDelay(fadeoutDelay)
@@ -24,11 +24,11 @@ CCScrollbarAnimationControllerLinearFade::CCScrollbarAnimationControllerLinearFa
{
}
-CCScrollbarAnimationControllerLinearFade::~CCScrollbarAnimationControllerLinearFade()
+ScrollbarAnimationControllerLinearFade::~ScrollbarAnimationControllerLinearFade()
{
}
-bool CCScrollbarAnimationControllerLinearFade::animate(double monotonicTime)
+bool ScrollbarAnimationControllerLinearFade::animate(double monotonicTime)
{
float opacity = opacityAtTime(monotonicTime);
if (horizontalScrollbarLayer())
@@ -38,21 +38,21 @@ bool CCScrollbarAnimationControllerLinearFade::animate(double monotonicTime)
return opacity;
}
-void CCScrollbarAnimationControllerLinearFade::didPinchGestureUpdateAtTime(double)
+void ScrollbarAnimationControllerLinearFade::didPinchGestureUpdateAtTime(double)
{
m_pinchGestureInEffect = true;
}
-void CCScrollbarAnimationControllerLinearFade::didPinchGestureEndAtTime(double monotonicTime)
+void ScrollbarAnimationControllerLinearFade::didPinchGestureEndAtTime(double monotonicTime)
{
m_pinchGestureInEffect = false;
m_lastAwakenTime = monotonicTime;
}
-void CCScrollbarAnimationControllerLinearFade::updateScrollOffsetAtTime(CCLayerImpl* scrollLayer, double monotonicTime)
+void ScrollbarAnimationControllerLinearFade::updateScrollOffsetAtTime(LayerImpl* scrollLayer, double monotonicTime)
{
FloatPoint previousPos = currentPos();
- CCScrollbarAnimationController::updateScrollOffsetAtTime(scrollLayer, monotonicTime);
+ ScrollbarAnimationController::updateScrollOffsetAtTime(scrollLayer, monotonicTime);
if (previousPos == currentPos())
return;
@@ -60,7 +60,7 @@ void CCScrollbarAnimationControllerLinearFade::updateScrollOffsetAtTime(CCLayerI
m_lastAwakenTime = monotonicTime;
}
-float CCScrollbarAnimationControllerLinearFade::opacityAtTime(double monotonicTime)
+float ScrollbarAnimationControllerLinearFade::opacityAtTime(double monotonicTime)
{
if (m_pinchGestureInEffect)
return 1;