summaryrefslogtreecommitdiffstats
path: root/gpu/command_buffer/service/cmd_parser_test.cc
diff options
context:
space:
mode:
authorrsimha@google.com <rsimha@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-08 00:18:25 +0000
committerrsimha@google.com <rsimha@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-08 00:18:25 +0000
commit84677847c10d0319d8d996aea9b310add85c0bd3 (patch)
tree12eceac742ce01154307bd86f28e8d87e95cf07a /gpu/command_buffer/service/cmd_parser_test.cc
parent973d44a198f2fa9314ecbe43b06f0a7d622dfc7e (diff)
downloadchromium_src-84677847c10d0319d8d996aea9b310add85c0bd3.zip
chromium_src-84677847c10d0319d8d996aea9b310add85c0bd3.tar.gz
chromium_src-84677847c10d0319d8d996aea9b310add85c0bd3.tar.bz2
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
Diffstat (limited to 'gpu/command_buffer/service/cmd_parser_test.cc')
-rw-r--r--gpu/command_buffer/service/cmd_parser_test.cc40
1 files changed, 6 insertions, 34 deletions
diff --git a/gpu/command_buffer/service/cmd_parser_test.cc b/gpu/command_buffer/service/cmd_parser_test.cc
index b86b0af..857ca8e 100644
--- a/gpu/command_buffer/service/cmd_parser_test.cc
+++ b/gpu/command_buffer/service/cmd_parser_test.cc
@@ -48,10 +48,12 @@ class CommandParserTest : public testing::Test {
size_t command_buffer_size = entry_count *
sizeof(CommandBufferEntry); // NOLINT
DCHECK_LE(command_buffer_size, shm_size);
- CommandParser* parser = new CommandParser(api_mock());
-
- parser->SetBuffer(buffer(), shm_size, 0, command_buffer_size);
- return parser;
+ return new CommandParser(buffer(),
+ shm_size,
+ 0,
+ command_buffer_size,
+ 0,
+ api_mock());
}
unsigned int buffer_entry_count() { return 20; }
@@ -286,34 +288,4 @@ TEST_F(CommandParserTest, TestError) {
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