| 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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 , m_zeroTimeInitialized(false) | 70 , m_zeroTimeInitialized(false) |
| 71 , m_outdatedAnimationCount(0) | 71 , m_outdatedAnimationCount(0) |
| 72 , m_playbackRate(1) | 72 , m_playbackRate(1) |
| 73 , m_lastCurrentTimeInternal(0) | 73 , m_lastCurrentTimeInternal(0) |
| 74 { | 74 { |
| 75 if (!timing) | 75 if (!timing) |
| 76 m_timing = adoptPtrWillBeNoop(new AnimationTimelineTiming(this)); | 76 m_timing = adoptPtrWillBeNoop(new AnimationTimelineTiming(this)); |
| 77 else | 77 else |
| 78 m_timing = timing; | 78 m_timing = timing; |
| 79 | 79 |
| 80 if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled() && Platfor
m::current()->compositorSupport()) | 80 if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled() && Platfor
m::current()->isThreadedAnimationEnabled()) { |
| 81 ASSERT(Platform::current()->compositorSupport()); |
| 81 m_compositorTimeline = adoptPtr(Platform::current()->compositorSupport()
->createAnimationTimeline()); | 82 m_compositorTimeline = adoptPtr(Platform::current()->compositorSupport()
->createAnimationTimeline()); |
| 83 } |
| 82 | 84 |
| 83 ASSERT(document); | 85 ASSERT(document); |
| 84 } | 86 } |
| 85 | 87 |
| 86 AnimationTimeline::~AnimationTimeline() | 88 AnimationTimeline::~AnimationTimeline() |
| 87 { | 89 { |
| 88 #if !ENABLE(OILPAN) | 90 #if !ENABLE(OILPAN) |
| 89 for (const auto& animation : m_animations) | 91 for (const auto& animation : m_animations) |
| 90 animation->detachFromTimeline(); | 92 animation->detachFromTimeline(); |
| 91 #endif | 93 #endif |
| (...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 325 { | 327 { |
| 326 #if ENABLE(OILPAN) | 328 #if ENABLE(OILPAN) |
| 327 visitor->trace(m_document); | 329 visitor->trace(m_document); |
| 328 visitor->trace(m_timing); | 330 visitor->trace(m_timing); |
| 329 visitor->trace(m_animationsNeedingUpdate); | 331 visitor->trace(m_animationsNeedingUpdate); |
| 330 visitor->trace(m_animations); | 332 visitor->trace(m_animations); |
| 331 #endif | 333 #endif |
| 332 } | 334 } |
| 333 | 335 |
| 334 } // namespace | 336 } // namespace |
| OLD | NEW |