Oilpan: Partially ship Oilpan for core/animations

Source/core/animation/AnimationTimeline.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 29 matching lines @@
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/TraceEvent.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebCompositorAnimationTimeline.h"
 #include "public/platform/WebCompositorSupport.h"
 
 namespace blink {
 
 namespace {
 
-bool compareAnimations(const RefPtrWillBeMember<Animation>& left, const RefPtrWillBeMember<Animation>& right)
+bool compareAnimations(const Member<Animation>& left, const Member<Animation>& right)
 {
     return Animation::hasLowerPriority(left.get(), right.get());
 }
 
 }
 
 // This value represents 1 frame at 30Hz plus a little bit of wiggle room.
 // TODO: Plumb a nominal framerate through and derive this value from that.
 const double AnimationTimeline::s_minimumDelay = 0.04;
 
 
-PassRefPtrWillBeRawPtr<AnimationTimeline> AnimationTimeline::create(Document* document, PassOwnPtrWillBeRawPtr<PlatformTiming> timing)
+AnimationTimeline* AnimationTimeline::create(Document* document, PlatformTiming* timing)
 {
-    return adoptRefWillBeNoop(new AnimationTimeline(document, timing));
+    return new AnimationTimeline(document, timing);
 }
 
-AnimationTimeline::AnimationTimeline(Document* document, PassOwnPtrWillBeRawPtr<PlatformTiming> timing)
+AnimationTimeline::AnimationTimeline(Document* document, PlatformTiming* timing)
     : m_document(document)
     , m_zeroTime(0) // 0 is used by unit tests which cannot initialize from the loader
     , m_zeroTimeInitialized(false)
     , m_outdatedAnimationCount(0)
     , m_playbackRate(1)
     , m_lastCurrentTimeInternal(0)
 {
     if (!timing)
-        m_timing = adoptPtrWillBeNoop(new AnimationTimelineTiming(this));
+        m_timing = new AnimationTimelineTiming(this);
     else
         m_timing = timing;
 
     if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled() && Platform::current()->isThreadedAnimationEnabled()) {
         ASSERT(Platform::current()->compositorSupport());
         m_compositorTimeline = adoptPtr(Platform::current()->compositorSupport()->createAnimationTimeline());
     }
 
     ASSERT(document);
 }
 
 AnimationTimeline::~AnimationTimeline()
 {
-#if !ENABLE(OILPAN)
-    for (const auto& animation : m_animations)
-        animation->detachFromTimeline();
-#endif
 }
 
 void AnimationTimeline::animationAttached(Animation& animation)
 {
     ASSERT(animation.timeline() == this);
     ASSERT(!m_animations.contains(&animation));
     m_animations.add(&animation);
 }
 
 Animation* AnimationTimeline::play(AnimationEffect* child)
 {
     if (!m_document)
         return nullptr;
 
-    RefPtrWillBeRawPtr<Animation> animation = Animation::create(child, this);
-    ASSERT(m_animations.contains(animation.get()));
+    Animation* animation = Animation::create(child, this);
+    ASSERT(m_animations.contains(animation));
 
     animation->play();
     ASSERT(m_animationsNeedingUpdate.contains(animation));
 
-    return animation.get();
+    return animation;
 }
 
-WillBeHeapVector<RefPtrWillBeMember<Animation>> AnimationTimeline::getAnimations()
+HeapVector<Member<Animation>> AnimationTimeline::getAnimations()
 {
-    WillBeHeapVector<RefPtrWillBeMember<Animation>> animations;
+    HeapVector<Member<Animation>> animations;
     for (const auto& animation : m_animations) {
         if (animation->effect() && (animation->effect()->isCurrent() || animation->effect()->isInEffect()))
             animations.append(animation);
     }
     std::sort(animations.begin(), animations.end(), compareAnimations);
     return animations;
 }
 
 void AnimationTimeline::wake()
 {
     m_timing->serviceOnNextFrame();
 }
 
 void AnimationTimeline::serviceAnimations(TimingUpdateReason reason)
 {
     TRACE_EVENT0("blink", "AnimationTimeline::serviceAnimations");
 
     m_lastCurrentTimeInternal = currentTimeInternal();
 
     m_timing->cancelWake();
 
-    WillBeHeapVector<RawPtrWillBeMember<Animation>> animations;
+    HeapVector<Member<Animation>> animations;
     animations.reserveInitialCapacity(m_animationsNeedingUpdate.size());
-    for (RefPtrWillBeMember<Animation> animation : m_animationsNeedingUpdate)
-        animations.append(animation.get());
+    for (Animation* animation : m_animationsNeedingUpdate)
+        animations.append(animation);
 
     std::sort(animations.begin(), animations.end(), Animation::hasLowerPriority);
 
     for (Animation* animation : animations) {
         if (!animation->update(reason))
             m_animationsNeedingUpdate.remove(animation);
     }
 
     ASSERT(m_outdatedAnimationCount == 0);
 
@@ skipping 163 matching lines @@
 #if !ENABLE(OILPAN)
 void AnimationTimeline::detachFromDocument()
 {
     // FIXME: AnimationTimeline should keep Document alive.
     m_document = nullptr;
 }
 #endif
 
 DEFINE_TRACE(AnimationTimeline)
 {
-#if ENABLE(OILPAN)
     visitor->trace(m_document);
     visitor->trace(m_timing);
     visitor->trace(m_animationsNeedingUpdate);
     visitor->trace(m_animations);
-#endif
 }
 
 } // namespace