Implement new AnimationTimeline superclass

third_party/WebKit/Source/core/animation/CompositorPendingAnimations.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 26 matching lines @@
 #include "core/page/Page.h"
 #include "platform/instrumentation/tracing/TraceEvent.h"
 
 namespace blink {
 
 void CompositorPendingAnimations::Add(Animation* animation) {
   DCHECK(animation);
   DCHECK_EQ(pending_.Find(animation), kNotFound);
   pending_.push_back(animation);
 
-  Document* document = animation->timeline()->GetDocument();
+  Document* document = animation->TimelineInternal()->GetDocument();
   if (document->View())
     document->View()->ScheduleAnimation();
 
   bool visible = document->GetPage() && document->GetPage()->IsPageVisible();
   if (!visible && !timer_.IsActive()) {
     timer_.StartOneShot(0, BLINK_FROM_HERE);
   }
 }
 
 bool CompositorPendingAnimations::Update(
@@ skipping 19 matching lines @@
     // Animations with a start time do not participate in compositor start-time
     // grouping.
     if (animation->PreCommit(animation->HasStartTime() ? 1 : compositor_group,
                              composited_element_ids, start_on_compositor)) {
       if (animation->HasActiveAnimationsOnCompositor() &&
           !had_compositor_animation) {
         started_synchronized_on_compositor = true;
       }
 
       if (animation->Playing() && !animation->HasStartTime() &&
-          animation->timeline() && animation->timeline()->IsActive()) {
+          animation->TimelineInternal() &&
+          animation->TimelineInternal()->IsActive()) {
         waiting_for_start_time.push_back(animation.Get());
       }
     } else {
       deferred.push_back(animation);
     }
   }
 
   // If any synchronized animations were started on the compositor, all
   // remaining synchronized animations need to wait for the synchronized
   // start time. Otherwise they may start immediately.
   if (started_synchronized_on_compositor) {
     for (auto& animation : waiting_for_start_time) {
       if (!animation->HasStartTime()) {
         waiting_for_compositor_animation_start_.push_back(animation);
       }
     }
   } else {
     for (auto& animation : waiting_for_start_time) {
       if (!animation->HasStartTime()) {
         animation->NotifyCompositorStartTime(
-            animation->timeline()->CurrentTimeInternal());
+            animation->TimelineInternal()->CurrentTimeInternal());
       }
     }
   }
 
   // FIXME: The postCommit should happen *after* the commit, not before.
   for (auto& animation : animations)
-    animation->PostCommit(animation->timeline()->CurrentTimeInternal());
+    animation->PostCommit(animation->TimelineInternal()->CurrentTimeInternal());
 
   DCHECK(pending_.IsEmpty());
   DCHECK(start_on_compositor || deferred.IsEmpty());
   for (auto& animation : deferred)
     animation->SetCompositorPending();
   DCHECK_EQ(pending_.size(), deferred.size());
 
   if (started_synchronized_on_compositor)
     return true;
 
@@ skipping 17 matching lines @@
     double monotonic_animation_start_time,
     int compositor_group) {
   TRACE_EVENT0("blink",
                "CompositorPendingAnimations::notifyCompositorAnimationStarted");
   HeapVector<Member<Animation>> animations;
   animations.swap(waiting_for_compositor_animation_start_);
 
   for (auto animation : animations) {
     if (animation->HasStartTime() ||
         animation->PlayStateInternal() != Animation::kPending ||
-        !animation->timeline() || !animation->timeline()->IsActive()) {
+        !animation->TimelineInternal() ||
+        !animation->TimelineInternal()->IsActive()) {
       // Already started or no longer relevant.
       continue;
     }
     if (compositor_group && animation->CompositorGroup() != compositor_group) {
       // Still waiting.
       waiting_for_compositor_animation_start_.push_back(animation);
       continue;
     }
-    animation->NotifyCompositorStartTime(monotonic_animation_start_time -
-                                         animation->timeline()->ZeroTime());
+    animation->NotifyCompositorStartTime(
+        monotonic_animation_start_time -
+        animation->TimelineInternal()->ZeroTime());
   }
 }
 
 DEFINE_TRACE(CompositorPendingAnimations) {
   visitor->Trace(pending_);
   visitor->Trace(waiting_for_compositor_animation_start_);
 }
 
 }  // namespace blink