Fix the mac hangup when force-compositing-mode is enabled

gpu/command_buffer/service/gpu_scheduler.cc

 // Copyright (c) 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 "gpu/command_buffer/service/gpu_scheduler.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/debug/trace_event.h"
@@ skipping 119 matching lines @@
   parser_.reset();
 }
 
 #if defined(OS_MACOSX)
 namespace {
 const unsigned int kMaxOutstandingSwapBuffersCallsPerOnscreenContext = 1;
 }
 #endif
 
 void GpuScheduler::PutChanged(bool sync) {
-  TRACE_EVENT0("gpu", "GpuScheduler:PutChanged");
+  TRACE_EVENT1("gpu", "GpuScheduler:PutChanged", "this", this);
   CommandBuffer::State state = command_buffer_->GetState();
   parser_->set_put(state.put_offset);
 
   if (sync)
     ProcessCommands();
   else
     ScheduleProcessCommands();
 }
 
 void GpuScheduler::ProcessCommands() {
-  TRACE_EVENT0("gpu", "GpuScheduler:ProcessCommands");
+  TRACE_EVENT1("gpu", "GpuScheduler:ProcessCommands", "this", this);
   CommandBuffer::State state = command_buffer_->GetState();
   if (state.error != error::kNoError)
     return;
 
   if (unscheduled_count_ > 0) {
     TRACE_EVENT1("gpu", "EarlyOut_Unscheduled",
                  "unscheduled_count_", unscheduled_count_);
     return;
   }
 
   if (decoder_.get()) {
     if (!decoder_->MakeCurrent()) {
       LOG(ERROR) << "Context lost because MakeCurrent failed.";
       command_buffer_->SetParseError(error::kLostContext);
       return;
     }
   }
 
 #if defined(OS_MACOSX)
   bool do_rate_limiting = surface_.get() != NULL;
   // Don't swamp the browser process with SwapBuffers calls it can't handle.
   if (do_rate_limiting &&
       swap_buffers_count_ - acknowledged_swap_buffers_count_ >=
       kMaxOutstandingSwapBuffersCallsPerOnscreenContext) {
+    TRACE_EVENT0("gpu", "EarlyOut_OSX_Throttle");
     // Stop doing work on this command buffer. In the GPU process,
     // receipt of the GpuMsg_AcceleratedSurfaceBuffersSwappedACK
     // message causes ProcessCommands to be scheduled again.
     return;
   }
 #endif
 
   base::TimeTicks start_time = base::TimeTicks::Now();
   base::TimeDelta elapsed;
   bool is_break = false;
@@ skipping 33 matching lines @@
           elapsed.InMicroseconds() < kMinimumSchedulerQuantumMicros);
 
   if (unscheduled_count_ == 0 &&
       error != error::kWaiting &&
       !parser_->IsEmpty()) {
     ScheduleProcessCommands();
   }
 }
 
 void GpuScheduler::SetScheduled(bool scheduled) {
-  TRACE_EVENT2("gpu", "GpuScheduler:SetScheduled", "scheduled", scheduled,
-               "unscheduled_count_", unscheduled_count_);
+  TRACE_EVENT2("gpu", "GpuScheduler:SetScheduled", "this", this,
+               "new unscheduled_count_",
+               unscheduled_count_ + (scheduled? -1 : 1));
   if (scheduled) {
     --unscheduled_count_;
     DCHECK_GE(unscheduled_count_, 0);
 
     if (unscheduled_count_ == 0) {
       if (scheduled_callback_.get())
         scheduled_callback_->Run();
 
       ScheduleProcessCommands();
     }
@@ skipping 60 matching lines @@
       method_factory_.NewRunnableMethod(&GpuScheduler::ProcessCommands));
 }
 
 void GpuScheduler::WillResize(gfx::Size size) {
   if (wrapped_resize_callback_.get()) {
     wrapped_resize_callback_->Run(size);
   }
 }
 
 }  // namespace gpu