Merge gpu_trace_event back into base/debug/trace_event

gpu/command_buffer/client/cmd_buffer_helper.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.
 
 // This file contains the implementation of the command buffer helper class.
 
 #include "../client/cmd_buffer_helper.h"
 #include "../common/command_buffer.h"
-#include "gpu/common/gpu_trace_event.h"
+#include "../common/trace_event.h"
 
 namespace gpu {
 
 CommandBufferHelper::CommandBufferHelper(CommandBuffer* command_buffer)
     : command_buffer_(command_buffer),
       entries_(NULL),
       total_entry_count_(0),
       usable_entry_count_(0),
       token_(0),
       last_token_read_(-1),
@@ skipping 35 matching lines @@
 }
 
 void CommandBufferHelper::Flush() {
   last_put_sent_ = put_;
   command_buffer_->Flush(put_);
 }
 
 // Calls Flush() and then waits until the buffer is empty. Break early if the
 // error is set.
 bool CommandBufferHelper::Finish() {
-  GPU_TRACE_EVENT0("gpu", "CommandBufferHelper::Finish");
+  TRACE_EVENT0("gpu", "CommandBufferHelper::Finish");
   do {
     // Do not loop forever if the flush fails, meaning the command buffer reader
     // has shutdown.
     if (!FlushSync())
       return false;
   } while (put_ != get_);
 
   return true;
 }
 
 // Inserts a new token into the command stream. It uses an increasing value
 // scheme so that we don't lose tokens (a token has passed if the current token
 // value is higher than that token). Calls Finish() if the token value wraps,
 // which will be rare.
 int32 CommandBufferHelper::InsertToken() {
   // Increment token as 31-bit integer. Negative values are used to signal an
   // error.
   token_ = (token_ + 1) & 0x7FFFFFFF;
   cmd::SetToken& cmd = GetCmdSpace<cmd::SetToken>();
   cmd.Init(token_);
   if (token_ == 0) {
-    GPU_TRACE_EVENT0("gpu", "CommandBufferHelper::InsertToken(wrapped)");
+    TRACE_EVENT0("gpu", "CommandBufferHelper::InsertToken(wrapped)");
     // we wrapped
     Finish();
     GPU_DCHECK_EQ(token_, last_token_read_);
   }
   return token_;
 }
 
 // Waits until the current token value is greater or equal to the value passed
 // in argument.
 void CommandBufferHelper::WaitForToken(int32 token) {
-  GPU_TRACE_EVENT0("gpu", "CommandBufferHelper::WaitForToken");
+  TRACE_EVENT0("gpu", "CommandBufferHelper::WaitForToken");
   // Return immediately if corresponding InsertToken failed.
   if (token < 0)
     return;
   if (token > token_) return;  // we wrapped
   while (last_token_read_ < token) {
     if (get_ == put_) {
       GPU_LOG(FATAL) << "Empty command buffer while waiting on a token.";
       return;
     }
     // Do not loop forever if the flush fails, meaning the command buffer reader
@@ skipping 15 matching lines @@
 // space may not be available.
 void CommandBufferHelper::WaitForAvailableEntries(int32 count) {
   GPU_CHECK(count < usable_entry_count_);
   if (put_ + count > usable_entry_count_) {
     // There's not enough room between the current put and the end of the
     // buffer, so we need to wrap. We will add a jump back to the start, but we
     // need to make sure get wraps first, actually that get is 1 or more (since
     // put will wrap to 0 after we add the jump).
     GPU_DCHECK_LE(1, put_);
     if (get_ > put_ || get_ == 0) {
-      GPU_TRACE_EVENT0("gpu", "CommandBufferHelper::WaitForAvailableEntries");
+      TRACE_EVENT0("gpu", "CommandBufferHelper::WaitForAvailableEntries");
       while (get_ > put_ || get_ == 0) {
         // Do not loop forever if the flush fails, meaning the command buffer
         // reader has shutdown.
         if (!FlushSync())
           return;
       }
     }
     // Insert a jump back to the beginning.
     cmd::Jump::Set(&entries_[put_], 0);
     put_ = 0;
   }
   if (AvailableEntries() < count) {
-    GPU_TRACE_EVENT0("gpu", "CommandBufferHelper::WaitForAvailableEntries1");
+    TRACE_EVENT0("gpu", "CommandBufferHelper::WaitForAvailableEntries1");
     while (AvailableEntries() < count) {
       // Do not loop forever if the flush fails, meaning the command buffer
       // reader has shutdown.
       if (!FlushSync())
         return;
     }
   }
   // Force a flush if the buffer is getting half full, or even earlier if the
   // reader is known to be idle.
   int32 pending =
@@ skipping 21 matching lines @@
   SynchronizeState(state);
   return static_cast<error::Error>(state.error);
 }
 
 void CommandBufferHelper::SynchronizeState(CommandBuffer::State state) {
   get_ = state.get_offset;
   last_token_read_ = state.token;
 }
 
 }  // namespace gpu