OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google 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 are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 15 matching lines...) Expand all Loading... |
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 */ | 29 */ |
30 | 30 |
31 #include "core/animation/KeyframeEffect.h" | 31 #include "core/animation/KeyframeEffect.h" |
32 | 32 |
33 #include "bindings/core/v8/Dictionary.h" | 33 #include "bindings/core/v8/Dictionary.h" |
34 #include "bindings/core/v8/ExceptionState.h" | 34 #include "bindings/core/v8/ExceptionState.h" |
35 #include "core/animation/Animation.h" | 35 #include "core/animation/Animation.h" |
| 36 #include "core/animation/AnimationEffectTiming.h" |
36 #include "core/animation/AnimationTimeline.h" | 37 #include "core/animation/AnimationTimeline.h" |
37 #include "core/animation/CompositorAnimations.h" | 38 #include "core/animation/CompositorAnimations.h" |
38 #include "core/animation/ElementAnimations.h" | 39 #include "core/animation/ElementAnimations.h" |
39 #include "core/animation/Interpolation.h" | 40 #include "core/animation/Interpolation.h" |
40 #include "core/animation/KeyframeEffectModel.h" | 41 #include "core/animation/KeyframeEffectModel.h" |
41 #include "core/animation/KeyframeEffectOptions.h" | 42 #include "core/animation/KeyframeEffectOptions.h" |
42 #include "core/animation/KeyframeEffectReadOnly.h" | 43 #include "core/animation/KeyframeEffectReadOnly.h" |
43 #include "core/animation/PropertyHandle.h" | 44 #include "core/animation/PropertyHandle.h" |
44 #include "core/dom/Element.h" | 45 #include "core/dom/Element.h" |
45 #include "core/dom/NodeComputedStyle.h" | 46 #include "core/dom/NodeComputedStyle.h" |
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
352 CompositorAnimations::pauseAnimationForTestingOnCompositor(*m_target, *a
nimation(), compositorAnimationId, pauseTime); | 353 CompositorAnimations::pauseAnimationForTestingOnCompositor(*m_target, *a
nimation(), compositorAnimationId, pauseTime); |
353 } | 354 } |
354 | 355 |
355 void KeyframeEffect::attachCompositedLayers() | 356 void KeyframeEffect::attachCompositedLayers() |
356 { | 357 { |
357 DCHECK(m_target); | 358 DCHECK(m_target); |
358 DCHECK(animation()); | 359 DCHECK(animation()); |
359 CompositorAnimations::attachCompositedLayers(*m_target, *animation()); | 360 CompositorAnimations::attachCompositedLayers(*m_target, *animation()); |
360 } | 361 } |
361 | 362 |
| 363 AnimationEffectTiming* KeyframeEffect::timing() |
| 364 { |
| 365 return AnimationEffectTiming::create(this); |
| 366 } |
| 367 |
362 DEFINE_TRACE(KeyframeEffect) | 368 DEFINE_TRACE(KeyframeEffect) |
363 { | 369 { |
364 KeyframeEffectReadOnly::trace(visitor); | 370 KeyframeEffectReadOnly::trace(visitor); |
365 } | 371 } |
366 | 372 |
367 } // namespace blink | 373 } // namespace blink |
OLD | NEW |