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

gpu/command_buffer/service/cmd_parser_test.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.
 
 // Tests for the command parser.
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "gpu/command_buffer/service/cmd_parser.h"
 #include "gpu/command_buffer/service/mocks.h"
@@ skipping 30 matching lines @@
         .WillOnce(Return(_return));
   }
 
   // Creates a parser, with a buffer of the specified size (in entries).
   CommandParser *MakeParser(unsigned int entry_count) {
     size_t shm_size = buffer_entry_count_ *
                       sizeof(CommandBufferEntry);  // NOLINT
     size_t command_buffer_size = entry_count *
                                  sizeof(CommandBufferEntry);  // NOLINT
     DCHECK_LE(command_buffer_size, shm_size);
-    return new CommandParser(buffer(),
-                             shm_size,
-                             0,
-                             command_buffer_size,
-                             0,
-                             api_mock());
+    CommandParser* parser = new CommandParser(api_mock());
+
+    parser->SetBuffer(buffer(), shm_size, 0, command_buffer_size);
+    return parser;
   }
 
   unsigned int buffer_entry_count() { return 20; }
   AsyncAPIMock *api_mock() { return api_mock_.get(); }
   CommandBufferEntry *buffer() { return buffer_.get(); }
  private:
   unsigned int buffer_entry_count_;
   scoped_ptr<AsyncAPIMock> api_mock_;
   scoped_array<CommandBufferEntry> buffer_;
   Sequence sequence_;
@@ skipping 214 matching lines @@
   // correctly.
   EXPECT_EQ(put_post_fail, parser->get());
   Mock::VerifyAndClearExpectations(api_mock());
   // make the second one succeed, and check that the parser recovered fine.
   AddDoCommandExpect(error::kNoError, 4, 0, NULL);
   EXPECT_EQ(error::kNoError, parser->ProcessAllCommands());
   EXPECT_EQ(put, parser->get());
   Mock::VerifyAndClearExpectations(api_mock());
 }
 
+TEST_F(CommandParserTest, SetBuffer) {
+  scoped_ptr<CommandParser> parser(MakeParser(3));
+  CommandBufferOffset put = parser->put();
+  CommandHeader header;
+
+  // add a single command, no args
+  header.size = 2;
+  header.command = 123;
+  buffer()[put++].value_header = header;
+  buffer()[put++].value_int32 = 456;
+
+  CommandBufferEntry param_array[1];
+  param_array[0].value_int32 = 456;
+
+  parser->set_put(put);
+  AddDoCommandExpect(error::kNoError, 123, 1, param_array);
+  EXPECT_EQ(error::kNoError, parser->ProcessAllCommands());
+  // We should have advanced 2 entries
+  EXPECT_EQ(2, parser->get());
+  Mock::VerifyAndClearExpectations(api_mock());
+
+  scoped_array<CommandBufferEntry> buffer2(new CommandBufferEntry[2]);
+  parser->SetBuffer(
+      buffer2.get(), sizeof(CommandBufferEntry) * 2, 0,
+      sizeof(CommandBufferEntry) * 2);
+  // The put and get should have reset to 0.
+  EXPECT_EQ(0, parser->get());
+  EXPECT_EQ(0, parser->put());
+}
+
 }  // namespace gpu