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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « webkit/compositor_bindings/web_animation_id_provider.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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.h"
8 #include "cc/animation_curve.h" 8 #include "cc/animation_curve.h"
9 #include "cc/animation_id_provider.h"
9 #include "third_party/WebKit/Source/Platform/chromium/public/WebAnimationCurve.h " 10 #include "third_party/WebKit/Source/Platform/chromium/public/WebAnimationCurve.h "
10 #include "third_party/WebKit/Source/Platform/chromium/public/WebAnimation.h" 11 #include "third_party/WebKit/Source/Platform/chromium/public/WebAnimation.h"
11 #include "webkit/compositor_bindings/web_animation_id_provider.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 webkit::WebAnimationIdProvider; 16 using cc::AnimationIdProvider;
17 17
18 namespace WebKit { 18 namespace WebKit {
19 19
20 WebAnimationImpl::WebAnimationImpl(const WebAnimationCurve& webCurve, TargetProp erty targetProperty, int animationId, int groupId) 20 WebAnimationImpl::WebAnimationImpl(const WebAnimationCurve& webCurve, TargetProp erty targetProperty, int animationId, int groupId)
21 { 21 {
22 if (!animationId) 22 if (!animationId)
23 animationId = WebAnimationIdProvider::NextAnimationId(); 23 animationId = AnimationIdProvider::NextAnimationId();
24 if (!groupId) 24 if (!groupId)
25 groupId = WebAnimationIdProvider::NextGroupId(); 25 groupId = AnimationIdProvider::NextGroupId();
26 26
27 WebAnimationCurve::AnimationCurveType curveType = webCurve.type(); 27 WebAnimationCurve::AnimationCurveType curveType = webCurve.type();
28 scoped_ptr<cc::AnimationCurve> curve; 28 scoped_ptr<cc::AnimationCurve> curve;
29 switch (curveType) { 29 switch (curveType) {
30 case WebAnimationCurve::AnimationCurveTypeFloat: { 30 case WebAnimationCurve::AnimationCurveTypeFloat: {
31 const WebFloatAnimationCurveImpl* floatCurveImpl = static_cast<const Web FloatAnimationCurveImpl*>(&webCurve); 31 const WebFloatAnimationCurveImpl* floatCurveImpl = static_cast<const Web FloatAnimationCurveImpl*>(&webCurve);
32 curve = floatCurveImpl->cloneToAnimationCurve(); 32 curve = floatCurveImpl->cloneToAnimationCurve();
33 break; 33 break;
34 } 34 }
35 case WebAnimationCurve::AnimationCurveTypeTransform: { 35 case WebAnimationCurve::AnimationCurveTypeTransform: {
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 } 96 }
97 97
98 scoped_ptr<cc::Animation> WebAnimationImpl::cloneToAnimation() 98 scoped_ptr<cc::Animation> WebAnimationImpl::cloneToAnimation()
99 { 99 {
100 scoped_ptr<cc::Animation> toReturn(m_animation->clone(cc::Animation::NonCont rollingInstance)); 100 scoped_ptr<cc::Animation> toReturn(m_animation->clone(cc::Animation::NonCont rollingInstance));
101 toReturn->setNeedsSynchronizedStartTime(true); 101 toReturn->setNeedsSynchronizedStartTime(true);
102 return toReturn.Pass(); 102 return toReturn.Pass();
103 } 103 }
104 104
105 } // namespace WebKit 105 } // namespace WebKit
OLDNEW
« 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