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

Side by Side Diff: webkit/compositor_bindings/web_animation_impl.cc

Issue 12822004: Part 3 of cc/ directory shuffles: animation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 "webkit/compositor_bindings/web_animation_impl.h" 5 #include "webkit/compositor_bindings/web_animation_impl.h"
6 6
7 #include "cc/animation.h" 7 #include "cc/animation/animation.h"
8 #include "cc/animation_curve.h" 8 #include "cc/animation/animation_curve.h"
9 #include "cc/animation_id_provider.h" 9 #include "cc/animation/animation_id_provider.h"
10 #include "third_party/WebKit/Source/Platform/chromium/public/WebAnimation.h"
10 #include "third_party/WebKit/Source/Platform/chromium/public/WebAnimationCurve.h " 11 #include "third_party/WebKit/Source/Platform/chromium/public/WebAnimationCurve.h "
11 #include "third_party/WebKit/Source/Platform/chromium/public/WebAnimation.h"
12 #include "webkit/compositor_bindings/web_float_animation_curve_impl.h" 12 #include "webkit/compositor_bindings/web_float_animation_curve_impl.h"
13 #include "webkit/compositor_bindings/web_transform_animation_curve_impl.h" 13 #include "webkit/compositor_bindings/web_transform_animation_curve_impl.h"
14 14
15 using cc::Animation; 15 using cc::Animation;
16 using cc::AnimationIdProvider; 16 using cc::AnimationIdProvider;
17 17
18 namespace WebKit { 18 namespace WebKit {
19 19
20 WebAnimationImpl::WebAnimationImpl(const WebAnimationCurve& web_curve, 20 WebAnimationImpl::WebAnimationImpl(const WebAnimationCurve& web_curve,
21 TargetProperty target_property, 21 TargetProperty target_property,
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 } 85 }
86 86
87 scoped_ptr<cc::Animation> WebAnimationImpl::cloneToAnimation() { 87 scoped_ptr<cc::Animation> WebAnimationImpl::cloneToAnimation() {
88 scoped_ptr<cc::Animation> to_return( 88 scoped_ptr<cc::Animation> to_return(
89 animation_->Clone(cc::Animation::NonControllingInstance)); 89 animation_->Clone(cc::Animation::NonControllingInstance));
90 to_return->set_needs_synchronized_start_time(true); 90 to_return->set_needs_synchronized_start_time(true);
91 return to_return.Pass(); 91 return to_return.Pass();
92 } 92 }
93 93
94 } // namespace WebKit 94 } // namespace WebKit
OLDNEW
« no previous file with comments | « ui/compositor/transform_animation_curve_adapter.h ('k') | webkit/compositor_bindings/web_float_animation_curve_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698