OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2013 Intel Corporation. All rights reserved. | 2 * Copyright (C) 2013 Intel Corporation. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
(...skipping 10 matching lines...) Expand all Loading... |
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
24 */ | 24 */ |
25 | 25 |
26 #include "config.h" | 26 #include "config.h" |
27 | 27 |
28 #include "core/rendering/animation/WebAnimationProvider.h" | 28 #include "core/rendering/animation/WebAnimationProvider.h" |
29 | 29 |
30 #include "core/platform/animation/AnimationTranslationUtil.h" | 30 #include "core/platform/animation/AnimationTranslationUtil.h" |
31 #include "core/platform/animation/CSSAnimationData.h" | |
32 #include "core/rendering/style/KeyframeList.h" | 31 #include "core/rendering/style/KeyframeList.h" |
33 #include "core/rendering/style/RenderStyle.h" | 32 #include "core/rendering/style/RenderStyle.h" |
| 33 #include "platform/animation/CSSAnimationData.h" |
34 #include "public/platform/WebAnimation.h" | 34 #include "public/platform/WebAnimation.h" |
35 #include "wtf/text/StringBuilder.h" | 35 #include "wtf/text/StringBuilder.h" |
36 | 36 |
37 using blink::WebAnimation; | 37 using blink::WebAnimation; |
38 | 38 |
39 namespace WebCore { | 39 namespace WebCore { |
40 | 40 |
41 namespace { | 41 namespace { |
42 | 42 |
43 String animationNameForTransition(AnimatedPropertyID property) | 43 String animationNameForTransition(AnimatedPropertyID property) |
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
205 OwnPtr<WebAnimation> webAnimation(createWebAnimation(values, animation, anim
ationId, timeOffset, boxSize)); | 205 OwnPtr<WebAnimation> webAnimation(createWebAnimation(values, animation, anim
ationId, timeOffset, boxSize)); |
206 if (!webAnimation) | 206 if (!webAnimation) |
207 return PassOwnPtr<WebAnimation>(); | 207 return PassOwnPtr<WebAnimation>(); |
208 | 208 |
209 if (!animationId) | 209 if (!animationId) |
210 m_animationIdMap.set(animationName, webAnimation->id()); | 210 m_animationIdMap.set(animationName, webAnimation->id()); |
211 return webAnimation.release(); | 211 return webAnimation.release(); |
212 } | 212 } |
213 | 213 |
214 } // namespace WebCore | 214 } // namespace WebCore |
OLD | NEW |