cc: Release main thread earlier

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 1004 matching lines @@
   DCHECK(current_resource_update_controller_on_impl_thread_);
 
   // Complete all remaining texture updates.
   current_resource_update_controller_on_impl_thread_->Finalize();
   current_resource_update_controller_on_impl_thread_.reset();
 
   inside_commit_ = true;
   layer_tree_host_impl_->BeginCommit();
   layer_tree_host()->BeginCommitOnImplThread(layer_tree_host_impl_.get());
   layer_tree_host()->FinishCommitOnImplThread(layer_tree_host_impl_.get());
-  layer_tree_host_impl_->CommitComplete();
   inside_commit_ = false;

[enne (OOO), 2014/01/15 00:36:04]

This variable is a little bit weird.  It's only read on the main thread, so it
needs to get updated before the lock is released.

Maybe it needs to be renamed for clarity, since in some ways the commit isn't
done for the compositor thread at this point.

[brianderson, 2014/01/15 00:59:38]

main_thread_inside_commit_?

[enne (OOO), 2014/01/15 01:21:49]

Done.

 
-  SetInputThrottledUntilCommitOnImplThread(false);
-
-  UpdateBackgroundAnimateTicking();
-
-  next_frame_is_newly_committed_frame_on_impl_thread_ = true;
-
   if (layer_tree_host()->settings().impl_side_painting &&
       commit_waits_for_activation_) {
     // For some layer types in impl-side painting, the commit is held until
     // the pending tree is activated.  It's also possible that the
     // pending tree has already activated if there was no work to be done.
     TRACE_EVENT_INSTANT0("cc", "HoldCommit", TRACE_EVENT_SCOPE_THREAD);
     completion_event_for_commit_held_on_tree_activation_ =
         commit_completion_event_on_impl_thread_;
     commit_completion_event_on_impl_thread_ = NULL;
   } else {
     commit_completion_event_on_impl_thread_->Signal();
     commit_completion_event_on_impl_thread_ = NULL;
   }
 
+  // Delay this step until afer the main thread has been released as it's
+  // often a good bit of work to update the tree and prepare the new frame.
+  layer_tree_host_impl_->CommitComplete();
+
+  SetInputThrottledUntilCommitOnImplThread(false);
+
+  UpdateBackgroundAnimateTicking();
+
+  next_frame_is_newly_committed_frame_on_impl_thread_ = true;
   commit_waits_for_activation_ = false;
 
   commit_complete_time_ = base::TimeTicks::HighResNow();
   begin_main_frame_to_commit_duration_history_.InsertSample(
       commit_complete_time_ - begin_main_frame_sent_time_);
 
   // SetVisible kicks off the next scheduler action, so this must be last.
   scheduler_on_impl_thread_->SetVisible(layer_tree_host_impl_->visible());
 }
 
@@ skipping 588 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