Revert 245445 "Unifies LayerTreeHost::SetNeedsUpdateLayers and S..."

trunk/src/cc/trees/thread_proxy.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/trees/thread_proxy.h"
 
 #include <string>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
@@ skipping 63 matching lines @@
     LayerTreeHost* layer_tree_host,
     scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner) {
   return make_scoped_ptr(
       new ThreadProxy(layer_tree_host, impl_task_runner)).PassAs<Proxy>();
 }
 
 ThreadProxy::ThreadProxy(
     LayerTreeHost* layer_tree_host,
     scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner)
     : Proxy(impl_task_runner),
-      update_requested_(false),
+      animate_requested_(false),
       commit_requested_(false),
       commit_request_sent_to_impl_thread_(false),
       created_offscreen_context_provider_(false),
       layer_tree_host_unsafe_(layer_tree_host),
       contents_texture_manager_unsafe_(NULL),
       started_(false),
       textures_acquired_(true),
       in_composite_and_readback_(false),
       manage_tiles_pending_(false),
       commit_waits_for_activation_(false),
@@ skipping 248 matching lines @@
       base::Bind(&ThreadProxy::SetNeedsCommitOnImplThread,
                  impl_thread_weak_ptr_));
 }
 
 const RendererCapabilities& ThreadProxy::GetRendererCapabilities() const {
   DCHECK(IsMainThread());
   DCHECK(!layer_tree_host()->output_surface_lost());
   return renderer_capabilities_main_thread_copy_;
 }
 
+void ThreadProxy::SetNeedsAnimate() {
+  DCHECK(IsMainThread());
+  if (animate_requested_)
+    return;
+
+  TRACE_EVENT0("cc", "ThreadProxy::SetNeedsAnimate");
+  animate_requested_ = true;
+  can_cancel_commit_ = false;
+  SendCommitRequestToImplThreadIfNeeded();
+}
+
 void ThreadProxy::SetNeedsUpdateLayers() {
   DCHECK(IsMainThread());
 
-  if (update_requested_)
+  if (commit_request_sent_to_impl_thread_)
     return;
   TRACE_EVENT0("cc", "ThreadProxy::SetNeedsUpdateLayers");
 
-  update_requested_ = true;
   SendCommitRequestToImplThreadIfNeeded();
 }
 
 void ThreadProxy::SetNeedsCommit() {
   DCHECK(IsMainThread());
   // Unconditionally set here to handle SetNeedsCommit calls during a commit.
   can_cancel_commit_ = false;
 
   if (commit_requested_)
     return;
@@ skipping 397 matching lines @@
   SwapPromiseChecker swap_promise_checker(layer_tree_host());
 
   // Do not notify the impl thread of commit requests that occur during
   // the apply/animate/layout part of the BeginMainFrameAndCommit process since
   // those commit requests will get painted immediately. Once we have done
   // the paint, commit_requested_ will be set to false to allow new commit
   // requests to be scheduled.
   commit_requested_ = true;
   commit_request_sent_to_impl_thread_ = true;
 
-  // On the other hand, the update_requested_ flag needs to be cleared
-  // here so that any update requests generated by the apply or animate
+  // On the other hand, the AnimationRequested flag needs to be cleared
+  // here so that any animation requests generated by the apply or animate
   // callbacks will trigger another frame.
-  update_requested_ = false;
+  animate_requested_ = false;
 
   if (!in_composite_and_readback_ && !layer_tree_host()->visible()) {
     commit_requested_ = false;
     commit_request_sent_to_impl_thread_ = false;
 
     TRACE_EVENT0("cc", "EarlyOut_NotVisible");
     bool did_handle = false;
     Proxy::ImplThreadTaskRunner()->PostTask(
         FROM_HERE,
         base::Bind(&ThreadProxy::BeginMainFrameAbortedOnImplThread,
@@ skipping 42 matching lines @@
   TRACE_EVENT_SYNTHETIC_DELAY_END("cc.BeginMainFrame");
 
   // Clear the commit flag after updating animations and layout here --- objects
   // that only layout when painted will trigger another SetNeedsCommit inside
   // UpdateLayers.
   commit_requested_ = false;
   commit_request_sent_to_impl_thread_ = false;
   bool can_cancel_this_commit =
       can_cancel_commit_ &&
       !in_composite_and_readback_ &&
-      !evicted_ui_resources &&
-      !layer_tree_host()->next_commit_forces_redraw();
+      !evicted_ui_resources;
   can_cancel_commit_ = true;
 
   scoped_ptr<ResourceUpdateQueue> queue =
       make_scoped_ptr(new ResourceUpdateQueue);
 
   bool updated = layer_tree_host()->UpdateLayers(queue.get());
 
   // Once single buffered layers are committed, they cannot be modified until
   // they are drawn by the impl thread.
   textures_acquired_ = false;
 
   layer_tree_host()->WillCommit();
 
-  // Before calling animate, we set update_requested_ to false. If it is true
-  // now, it means SetNeedsUpdateLayers was called again. Depending on during
-  // which phase of the commit SetNeedsUpdateLayers was called,
-  // commit_request_sent_to_impl_thread_ may be already cleared or not.
-  // We call SetNeedsUpdateLayers here to make sure a commit always gets posted.
-  if (update_requested_) {
-    // Forces SetNeedsUpdateLayers to consider posting a commit task.
-    update_requested_ = false;
-    SetNeedsUpdateLayers();
-  }
-
   if (!updated && can_cancel_this_commit) {
     TRACE_EVENT0("cc", "EarlyOut_NoUpdates");
     bool did_handle = true;
     Proxy::ImplThreadTaskRunner()->PostTask(
         FROM_HERE,
         base::Bind(&ThreadProxy::BeginMainFrameAbortedOnImplThread,
                    impl_thread_weak_ptr_,
                    did_handle));
 
     // Although the commit is internally aborted, this is because it has been
     // detected to be a no-op.  From the perspective of an embedder, this commit
     // went through, and input should no longer be throttled, etc.
     layer_tree_host()->CommitComplete();
     layer_tree_host()->DidBeginMainFrame();
     return;
   }
 
+  // Before calling animate, we set animate_requested_ to false. If it is true
+  // now, it means SetNeedAnimate was called again, but during a state when
+  // commit_request_sent_to_impl_thread_ = true. We need to force that call to
+  // happen again now so that the commit request is sent to the impl thread.
+  if (animate_requested_) {
+    // Forces SetNeedsAnimate to consider posting a commit task.
+    animate_requested_ = false;
+    SetNeedsAnimate();
+  }
+
   scoped_refptr<ContextProvider> offscreen_context_provider;
   if (renderer_capabilities_main_thread_copy_.using_offscreen_context3d &&
       layer_tree_host()->needs_offscreen_context()) {
     offscreen_context_provider =
         layer_tree_host()->client()->OffscreenContextProvider();
     if (offscreen_context_provider.get())
       created_offscreen_context_provider_ = true;
   }
 
   // Notify the impl thread that the main thread is ready to commit. This will
@@ skipping 744 matching lines @@
   commit_to_activate_duration_history_.InsertSample(
       base::TimeTicks::HighResNow() - commit_complete_time_);
 }
 
 void ThreadProxy::DidManageTiles() {
   DCHECK(IsImplThread());
   scheduler_on_impl_thread_->DidManageTiles();
 }
 
 }  // namespace cc