OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2007 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007 Apple Inc. 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 * | 7 * |
8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
(...skipping 22 matching lines...) Expand all Loading... |
33 #include "core/frame/animation/AnimationControllerPrivate.h" | 33 #include "core/frame/animation/AnimationControllerPrivate.h" |
34 #include "core/frame/animation/CSSPropertyAnimation.h" | 34 #include "core/frame/animation/CSSPropertyAnimation.h" |
35 #include "core/frame/animation/CompositeAnimation.h" | 35 #include "core/frame/animation/CompositeAnimation.h" |
36 #include "core/frame/animation/ImplicitAnimation.h" | 36 #include "core/frame/animation/ImplicitAnimation.h" |
37 #include "core/frame/animation/KeyframeAnimation.h" | 37 #include "core/frame/animation/KeyframeAnimation.h" |
38 #include "core/rendering/RenderBoxModelObject.h" | 38 #include "core/rendering/RenderBoxModelObject.h" |
39 #include "public/platform/Platform.h" | 39 #include "public/platform/Platform.h" |
40 | 40 |
41 namespace WebCore { | 41 namespace WebCore { |
42 | 42 |
43 ImplicitAnimation::ImplicitAnimation(const CSSAnimationData* transition, CSSProp
ertyID animatingProperty, RenderObject* renderer, CompositeAnimation* compAnim,
RenderStyle* fromStyle) | 43 ImplicitAnimation::ImplicitAnimation(const CSSAnimationData* transition, CSSProp
ertyID animatingProperty, RenderObject& renderer, CompositeAnimation* compAnim,
RenderStyle* fromStyle) |
44 : AnimationBase(transition, renderer, compAnim) | 44 : AnimationBase(transition, renderer, compAnim) |
45 , m_transitionProperty(transition->property()) | 45 , m_transitionProperty(transition->property()) |
46 , m_animatingProperty(animatingProperty) | 46 , m_animatingProperty(animatingProperty) |
47 , m_overridden(false) | 47 , m_overridden(false) |
48 , m_active(true) | 48 , m_active(true) |
49 , m_fromStyle(fromStyle) | 49 , m_fromStyle(fromStyle) |
50 { | 50 { |
51 ASSERT(animatingProperty != CSSPropertyInvalid); | 51 ASSERT(animatingProperty != CSSPropertyInvalid); |
52 blink::Platform::current()->histogramSparse("WebCore.Animation.CSSProperties
", UseCounter::mapCSSPropertyIdToCSSSampleIdForHistogram(m_animatingProperty)); | 52 blink::Platform::current()->histogramSparse("WebCore.Animation.CSSProperties
", UseCounter::mapCSSPropertyIdToCSSSampleIdForHistogram(m_animatingProperty)); |
53 } | 53 } |
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
274 // only need service at the end of the transition. | 274 // only need service at the end of the transition. |
275 if (CSSPropertyAnimation::animationOfPropertyIsAccelerated(m_animatingProper
ty) && isAccelerated()) { | 275 if (CSSPropertyAnimation::animationOfPropertyIsAccelerated(m_animatingProper
ty) && isAccelerated()) { |
276 bool isLooping; | 276 bool isLooping; |
277 getTimeToNextEvent(t, isLooping); | 277 getTimeToNextEvent(t, isLooping); |
278 } | 278 } |
279 | 279 |
280 return t; | 280 return t; |
281 } | 281 } |
282 | 282 |
283 } // namespace WebCore | 283 } // namespace WebCore |
OLD | NEW |