Thread ui opacity animations

ui/compositor/layer_animation_sequence.cc

Index: ui/compositor/layer_animation_sequence.cc
diff --git a/ui/compositor/layer_animation_sequence.cc b/ui/compositor/layer_animation_sequence.cc
index a997c385a3f49ce1cc696aff829679af5056d60b..d0408e0d9d325e3a9b935380417cd155e8e99b83 100644
--- a/ui/compositor/layer_animation_sequence.cc
+++ b/ui/compositor/layer_animation_sequence.cc
@@ -16,12 +16,18 @@ namespace ui {
 
 LayerAnimationSequence::LayerAnimationSequence()
     : is_cyclic_(false),
-      last_element_(0) {
+      last_element_(0),
+      waiting_for_group_start_(false),
+      animation_group_id_(0),
+      last_progressed_fraction_(0.0) {
 }
 
 LayerAnimationSequence::LayerAnimationSequence(LayerAnimationElement* element)

[sky, 2013/02/19 17:06:56]

Can we get rid of this and only have one constructor?

[ajuma, 2013/02/20 16:09:10]

Constructing a one-element sequence seems common enough that I think it's worth
keeping this constructor (there are several existing callers of this constructor
scattered across ui/ and ash/). If you feel strongly about removing this
constructor, how about I do this in a separate CL (either a follow-up or one
that lands before this one, whichever you prefer)?

     : is_cyclic_(false),
-      last_element_(0) {
+      last_element_(0),
+      waiting_for_group_start_(false),
+      animation_group_id_(0),
+      last_progressed_fraction_(0.0) {
   AddElement(element);
 }
 
@@ -31,8 +37,18 @@ LayerAnimationSequence::~LayerAnimationSequence() {
                     DetachedFromSequence(this, true));
 }
 
+void LayerAnimationSequence::ProgressToEffectiveStart(
+    LayerAnimationDelegate* delegate) {
+  if (elements_.empty())
+    return;
+
+  elements_[0]->set_animation_group_id(animation_group_id_);

[sky, 2013/02/19 17:06:56]

How come this is only done for the first element?

[ajuma, 2013/02/20 16:09:10]

To avoid making an extra pass over the sequence, this is set when starting each
element. To make this more clear, this is now being passed as an argument to
LayerAnimationElement::Start().

+  elements_[0]->ProgressToEffectiveStart(delegate);
+}
+
 void LayerAnimationSequence::Progress(base::TimeTicks now,
                                       LayerAnimationDelegate* delegate) {
+  DCHECK(start_time_ != base::TimeTicks());

[sky, 2013/02/19 17:06:56]

DCHECK_NE

[ajuma, 2013/02/20 16:09:10]

This won't compile, since values passed to DCHECK_NE need to have
operator<<(ostream, ...) defined (this is used when logging failures), but
base::TimeTicks doesn't define this.

   bool redraw_required = false;
 
   if (elements_.empty())
@@ -44,7 +60,8 @@ void LayerAnimationSequence::Progress(base::TimeTicks now,
   size_t current_index = last_element_ % elements_.size();
   base::TimeDelta element_duration;
   while (is_cyclic_ || last_element_ < elements_.size()) {
-    elements_[current_index]->set_start_time(last_start_);
+    elements_[current_index]->set_requested_start_time(last_start_);
+    elements_[current_index]->set_animation_group_id(animation_group_id_);
     if (!elements_[current_index]->IsFinished(now, &element_duration))
       break;
 
@@ -53,12 +70,16 @@ void LayerAnimationSequence::Progress(base::TimeTicks now,
       redraw_required = true;
     last_start_ += element_duration;
     ++last_element_;
+    last_progressed_fraction_ =

[sky, 2013/02/19 17:06:56]

Should this be reset early on to make sure it it set to 0?

[ajuma, 2013/02/20 16:09:10]

Done. This is now reset in ::Start.

+        elements_[current_index]->last_progressed_fraction();
     current_index = last_element_ % elements_.size();
   }
 
   if (is_cyclic_ || last_element_ < elements_.size()) {
     if (elements_[current_index]->Progress(now, delegate))
       redraw_required = true;
+    last_progressed_fraction_ =
+        elements_[current_index]->last_progressed_fraction();
   }
 
   // Since the delegate may be deleted due to the notifications below, it is
@@ -68,12 +89,14 @@ void LayerAnimationSequence::Progress(base::TimeTicks now,
 
   if (!is_cyclic_ && last_element_ == elements_.size()) {
     last_element_ = 0;
+    waiting_for_group_start_ = false;
+    animation_group_id_ = 0;
     NotifyEnded();
   }
 }
 
 bool LayerAnimationSequence::IsFinished(base::TimeTicks time) {
-  if (is_cyclic_)
+  if (is_cyclic_ || waiting_for_group_start_)
     return false;
 
   if (elements_.empty())
@@ -86,7 +109,7 @@ bool LayerAnimationSequence::IsFinished(base::TimeTicks time) {
   size_t current_index = last_element_;
   base::TimeDelta element_duration;
   while (current_index < elements_.size()) {
-    elements_[current_index]->set_start_time(current_start);
+    elements_[current_index]->set_requested_start_time(current_start);
     if (!elements_[current_index]->IsFinished(time, &element_duration))
       break;
 
@@ -107,6 +130,8 @@ void LayerAnimationSequence::ProgressToEnd(LayerAnimationDelegate* delegate) {
   while (current_index < elements_.size()) {
     if (elements_[current_index]->ProgressToEnd(delegate))
       redraw_required = true;
+    last_progressed_fraction_ =
+        elements_[current_index]->last_progressed_fraction();
     ++current_index;
     ++last_element_;
   }
@@ -116,6 +141,8 @@ void LayerAnimationSequence::ProgressToEnd(LayerAnimationDelegate* delegate) {
 
   if (!is_cyclic_) {
     last_element_ = 0;
+    waiting_for_group_start_ = false;
+    animation_group_id_ = 0;
     NotifyEnded();
   }
 }
@@ -129,13 +156,14 @@ void LayerAnimationSequence::GetTargetValue(
     elements_[i]->GetTargetValue(target);
 }
 
-void LayerAnimationSequence::Abort() {
+void LayerAnimationSequence::Abort(LayerAnimationDelegate* delegate) {
   size_t current_index = last_element_ % elements_.size();
   while (current_index < elements_.size()) {
-    elements_[current_index]->Abort();
+    elements_[current_index]->Abort(delegate);
     ++current_index;
   }
   last_element_ = 0;
+  waiting_for_group_start_ = false;
   NotifyAborted();
 }
 
@@ -156,6 +184,13 @@ bool LayerAnimationSequence::HasCommonProperty(
   return intersection.size() > 0;
 }
 
+bool LayerAnimationSequence::IsFirstElementThreaded() const {
+  if (!elements_.empty())
+    return elements_[0]->IsThreaded();
+
+  return false;
+}
+
 void LayerAnimationSequence::AddObserver(LayerAnimationObserver* observer) {
   if (!observers_.HasObserver(observer)) {
     observers_.AddObserver(observer);
@@ -168,6 +203,22 @@ void LayerAnimationSequence::RemoveObserver(LayerAnimationObserver* observer) {
   observer->DetachedFromSequence(this, true);
 }
 
+void LayerAnimationSequence::OnThreadedAnimationStarted(
+    const cc::AnimationEvent& event) {
+  if (elements_.empty() || event.groupId != animation_group_id_)
+    return;
+
+  size_t current_index = last_element_ % elements_.size();
+  const LayerAnimationElement::AnimatableProperties& element_properties =
+    elements_[current_index]->properties();
+  LayerAnimationElement::AnimatableProperty event_property =
+      LayerAnimationElement::ToAnimatableProperty(event.targetProperty);
+  DCHECK(element_properties.find(event_property) != element_properties.end());
+  elements_[current_index]->set_effective_start_time(
+      base::TimeTicks::FromInternalValue(
+          event.monotonicTime * base::Time::kMicrosecondsPerSecond));
+}
+
 void LayerAnimationSequence::OnScheduled() {
   NotifyScheduled();
 }