Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(390)

Unified Diff: gpu/command_buffer/service/gpu_scheduler_unittest.cc

Issue 8566059: Add CommandBuffer::SetGetBuffer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: etc Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: gpu/command_buffer/service/gpu_scheduler_unittest.cc
diff --git a/gpu/command_buffer/service/gpu_scheduler_unittest.cc b/gpu/command_buffer/service/gpu_scheduler_unittest.cc
index 2d230ecda4f59b6fe3c1f9ef694ce0c75121876f..928ce6fafedb22749b8c09198126e4af9b7998b1 100644
--- a/gpu/command_buffer/service/gpu_scheduler_unittest.cc
+++ b/gpu/command_buffer/service/gpu_scheduler_unittest.cc
@@ -31,6 +31,7 @@ const size_t kRingBufferEntries = kRingBufferSize / sizeof(CommandBufferEntry);
class GpuSchedulerTest : public testing::Test {
protected:
virtual void SetUp() {
+ // FIX before check-in!
Ken Russell (switch to Gerrit) 2011/11/21 18:04:10 Still to be done?
shared_memory_.reset(new ::base::SharedMemory);
shared_memory_->CreateAndMapAnonymous(kRingBufferSize);
buffer_ = static_cast<int32*>(shared_memory_->memory());
@@ -39,8 +40,6 @@ class GpuSchedulerTest : public testing::Test {
memset(buffer_, 0, kRingBufferSize);
command_buffer_.reset(new MockCommandBuffer);
- ON_CALL(*command_buffer_.get(), GetRingBuffer())
- .WillByDefault(Return(shared_memory_buffer_));
CommandBuffer::State default_state;
default_state.num_entries = kRingBufferEntries;
@@ -51,12 +50,9 @@ class GpuSchedulerTest : public testing::Test {
decoder_.reset(new gles2::MockGLES2Decoder());
- parser_ = new CommandParser(buffer_,
- kRingBufferEntries,
- 0,
- kRingBufferEntries,
- 0,
- async_api_.get());
+ parser_ = new CommandParser(async_api_.get());
+
+ parser_->SetBuffer(buffer_, kRingBufferEntries, 0, kRingBufferEntries);
scheduler_.reset(new gpu::GpuScheduler(command_buffer_.get(),
decoder_.get(),

Powered by Google App Engine
This is Rietveld 408576698