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

Unified Diff: webkit/compositor_bindings/WebAnimationImpl.cpp

Issue 11189043: cc: Rename cc classes and members to match filenames (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 months 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: webkit/compositor_bindings/WebAnimationImpl.cpp
diff --git a/webkit/compositor_bindings/WebAnimationImpl.cpp b/webkit/compositor_bindings/WebAnimationImpl.cpp
index 2a0db9e38f57f8f676523faf37f7d60537dcf31a..a45678c7dccf728c3fefcbc5af788d8186301f83 100644
--- a/webkit/compositor_bindings/WebAnimationImpl.cpp
+++ b/webkit/compositor_bindings/WebAnimationImpl.cpp
@@ -13,7 +13,7 @@
#include "third_party/WebKit/Source/Platform/chromium/public/WebAnimation.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebAnimationCurve.h"
-using cc::CCActiveAnimation;
+using cc::ActiveAnimation;
namespace WebKit {
@@ -32,20 +32,20 @@ WebAnimationImpl::WebAnimationImpl(const WebAnimationCurve& webCurve, TargetProp
groupId = nextGroupId++;
WebAnimationCurve::AnimationCurveType curveType = webCurve.type();
- scoped_ptr<cc::CCAnimationCurve> curve;
+ scoped_ptr<cc::AnimationCurve> curve;
switch (curveType) {
case WebAnimationCurve::AnimationCurveTypeFloat: {
const WebFloatAnimationCurveImpl* floatCurveImpl = static_cast<const WebFloatAnimationCurveImpl*>(&webCurve);
- curve = floatCurveImpl->cloneToCCAnimationCurve();
+ curve = floatCurveImpl->cloneToAnimationCurve();
break;
}
case WebAnimationCurve::AnimationCurveTypeTransform: {
const WebTransformAnimationCurveImpl* transformCurveImpl = static_cast<const WebTransformAnimationCurveImpl*>(&webCurve);
- curve = transformCurveImpl->cloneToCCAnimationCurve();
+ curve = transformCurveImpl->cloneToAnimationCurve();
break;
}
}
- m_animation = CCActiveAnimation::create(curve.Pass(), animationId, groupId, static_cast<cc::CCActiveAnimation::TargetProperty>(targetProperty));
+ m_animation = ActiveAnimation::create(curve.Pass(), animationId, groupId, static_cast<cc::ActiveAnimation::TargetProperty>(targetProperty));
}
WebAnimationImpl::~WebAnimationImpl()
@@ -102,9 +102,9 @@ void WebAnimationImpl::setAlternatesDirection(bool alternates)
m_animation->setAlternatesDirection(alternates);
}
-scoped_ptr<cc::CCActiveAnimation> WebAnimationImpl::cloneToCCAnimation()
+scoped_ptr<cc::ActiveAnimation> WebAnimationImpl::cloneToAnimation()
{
- scoped_ptr<cc::CCActiveAnimation> toReturn(m_animation->clone(cc::CCActiveAnimation::NonControllingInstance));
+ scoped_ptr<cc::ActiveAnimation> toReturn(m_animation->clone(cc::ActiveAnimation::NonControllingInstance));
toReturn->setNeedsSynchronizedStartTime(true);
return toReturn.Pass();
}

Powered by Google App Engine
This is Rietveld 408576698