Revert 113479 - Revert "Revert 113250 - Add CommandBuffer::SetGetBuffer"

Reason for revert: Bot redness. See http://build.chromium.org/p/chromium/builders/Mac10.6%20Tests%20%281%29/builds/15717

Original checkin notes:

This reverts commit bd45bd252aeb8babac62547a5c605fbf64287cd3.

TEST=ran webkit tests in DRT and webgl tests in chrome
BUG=103989

Review URL: http://codereview.chromium.org/8758026

TBR=gman@chromium.org
Review URL: http://codereview.chromium.org/8865008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113512 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 21 deletions

diff --git a/gpu/command_buffer/client/cmd_buffer_helper.cc b/gpu/command_buffer/client/cmd_buffer_helper.cc
index d43efc3..6328923 100644
--- a/gpu/command_buffer/client/cmd_buffer_helper.cc
+++ b/gpu/command_buffer/client/cmd_buffer_helper.cc
@@ -17,8 +17,6 @@ const double kFlushDelay = 1.0 / (5.0 * 60.0);
 
 CommandBufferHelper::CommandBufferHelper(CommandBuffer* command_buffer)
     : command_buffer_(command_buffer),
-      ring_buffer_id_(-1),
-      ring_buffer_size_(0),
       entries_(NULL),
       total_entry_count_(0),
       usable_entry_count_(0),
@@ -29,25 +27,14 @@ CommandBufferHelper::CommandBufferHelper(CommandBuffer* command_buffer)
       last_flush_time_(0) {
 }
 
-bool CommandBufferHelper::AllocateRingBuffer() {
-  int32 id = command_buffer_->CreateTransferBuffer(ring_buffer_size_, -1);
-  if (id < 0) {
-    return false;
-  }
-
-  ring_buffer_ = command_buffer_->GetTransferBuffer(id);
+bool CommandBufferHelper::Initialize(int32 ring_buffer_size) {
+  ring_buffer_ = command_buffer_->GetRingBuffer();
   if (!ring_buffer_.ptr)
     return false;
 
-  ring_buffer_id_ = id;
-  command_buffer_->SetGetBuffer(id);
-
-  // TODO(gman): Do we really need to call GetState here? We know get & put = 0
-  // Also do we need to check state.num_entries?
   CommandBuffer::State state = command_buffer_->GetState();
   entries_ = static_cast<CommandBufferEntry*>(ring_buffer_.ptr);
-  int32 num_ring_buffer_entries =
-      ring_buffer_size_ / sizeof(CommandBufferEntry);
+  int32 num_ring_buffer_entries = ring_buffer_size / sizeof(CommandBufferEntry);
   if (num_ring_buffer_entries > state.num_entries) {
     return false;
   }
@@ -61,11 +48,6 @@ bool CommandBufferHelper::AllocateRingBuffer() {
   return true;
 }
 
-bool CommandBufferHelper::Initialize(int32 ring_buffer_size) {
-  ring_buffer_size_ = ring_buffer_size;
-  return AllocateRingBuffer();
-}
-
 CommandBufferHelper::~CommandBufferHelper() {
 }