cc: Call ManageTiles explicitly

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 "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "cc/base/thread.h"
@@ skipping 366 matching lines @@
                has_pending_tree);
   scheduler_on_impl_thread_->SetHasPendingTree(has_pending_tree);
 }
 
 void ThreadProxy::SetNeedsCommitOnImplThread() {
   DCHECK(IsImplThread());
   TRACE_EVENT0("cc", "ThreadProxy::SetNeedsCommitOnImplThread");
   scheduler_on_impl_thread_->SetNeedsCommit();
 }
 
-void ThreadProxy::SetNeedsManageTilesOnImplThread() {
-  if (manage_tiles_pending_)
-    return;
-  Proxy::ImplThread()->PostTask(
-      base::Bind(&ThreadProxy::ManageTilesOnImplThread, impl_thread_weak_ptr_));
-  manage_tiles_pending_ = true;
-}
-
-void ThreadProxy::ManageTilesOnImplThread() {
-  // TODO(nduca): If needed, move this into CCSchedulerStateMachine.
-  manage_tiles_pending_ = false;
-  if (layer_tree_host_impl_)
-    layer_tree_host_impl_->ManageTiles();
-}
-
 void ThreadProxy::PostAnimationEventsToMainThreadOnImplThread(
     scoped_ptr<AnimationEventsVector> events,
     base::Time wall_clock_time) {
   DCHECK(IsImplThread());
   TRACE_EVENT0("cc",
                "ThreadProxy::PostAnimationEventsToMainThreadOnImplThread");
   Proxy::MainThread()->PostTask(base::Bind(&ThreadProxy::SetAnimationEvents,
                                            main_thread_weak_ptr_,
                                            base::Passed(&events),
                                            wall_clock_time));
@@ skipping 567 matching lines @@
   // Tell the main thread that the the newly-commited frame was drawn.
   if (next_frame_is_newly_committed_frame_on_impl_thread_) {
     next_frame_is_newly_committed_frame_on_impl_thread_ = false;
     Proxy::MainThread()->PostTask(
         base::Bind(&ThreadProxy::DidCommitAndDrawFrame, main_thread_weak_ptr_));
   }
 
   if (draw_frame)
     CheckOutputSurfaceStatusOnImplThread();
 
+  // Update the tile state after drawing.  This prevents manage tiles from
+  // being in the critical path for getting things on screen, but still
+  // makes sure that tile state is updated on a semi-regular basis.
+  if (layer_tree_host_impl_->settings().impl_side_painting)
+    layer_tree_host_impl_->ManageTiles();
+
   return result;
 }
 
 void ThreadProxy::AcquireLayerTextures() {
   // Called when the main thread needs to modify a layer texture that is used
   // directly by the compositor.
   // This method will block until the next compositor draw if there is a
   // previously committed frame that is still undrawn. This is necessary to
   // ensure that the main thread does not monopolize access to the textures.
   DCHECK(IsMainThread());
@@ skipping 393 matching lines @@
       !layer_tree_host_impl_->pending_tree()) {
     TRACE_EVENT_INSTANT0("cc", "ReleaseCommitbyActivation",
                          TRACE_EVENT_SCOPE_THREAD);
     DCHECK(layer_tree_host_impl_->settings().impl_side_painting);
     completion_event_for_commit_held_on_tree_activation_->Signal();
     completion_event_for_commit_held_on_tree_activation_ = NULL;
   }
 }
 
 }  // namespace cc