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

Unified Diff: webkit/compositor_bindings/web_animation_impl.cc

Issue 11896017: Thread ui opacity animations (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix ash_unittests Created 7 years, 10 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
« no previous file with comments | « webkit/compositor_bindings/web_animation_id_provider.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/compositor_bindings/web_animation_impl.cc
diff --git a/webkit/compositor_bindings/web_animation_impl.cc b/webkit/compositor_bindings/web_animation_impl.cc
index 21b0bc8352bee463ac6ab620918127499ced3e05..961df4dbb38855ce31d02706feebceb8b42ddc2e 100644
--- a/webkit/compositor_bindings/web_animation_impl.cc
+++ b/webkit/compositor_bindings/web_animation_impl.cc
@@ -6,23 +6,23 @@
#include "cc/animation.h"
#include "cc/animation_curve.h"
+#include "cc/animation_id_provider.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebAnimationCurve.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebAnimation.h"
-#include "webkit/compositor_bindings/web_animation_id_provider.h"
#include "webkit/compositor_bindings/web_float_animation_curve_impl.h"
#include "webkit/compositor_bindings/web_transform_animation_curve_impl.h"
using cc::Animation;
-using webkit::WebAnimationIdProvider;
+using cc::AnimationIdProvider;
namespace WebKit {
WebAnimationImpl::WebAnimationImpl(const WebAnimationCurve& webCurve, TargetProperty targetProperty, int animationId, int groupId)
{
if (!animationId)
- animationId = WebAnimationIdProvider::NextAnimationId();
+ animationId = AnimationIdProvider::NextAnimationId();
if (!groupId)
- groupId = WebAnimationIdProvider::NextGroupId();
+ groupId = AnimationIdProvider::NextGroupId();
WebAnimationCurve::AnimationCurveType curveType = webCurve.type();
scoped_ptr<cc::AnimationCurve> curve;
« no previous file with comments | « webkit/compositor_bindings/web_animation_id_provider.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698