| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "gpu/command_buffer/client/mapped_memory.h" | 5 #include "gpu/command_buffer/client/mapped_memory.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "gpu/command_buffer/client/cmd_buffer_helper.h" | 10 #include "gpu/command_buffer/client/cmd_buffer_helper.h" |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 .WillRepeatedly(DoAll(Invoke(api_mock_.get(), &AsyncAPIMock::SetToken), | 43 .WillRepeatedly(DoAll(Invoke(api_mock_.get(), &AsyncAPIMock::SetToken), |
| 44 Return(error::kNoError))); | 44 Return(error::kNoError))); |
| 45 | 45 |
| 46 { | 46 { |
| 47 TransferBufferManager* manager = new TransferBufferManager(); | 47 TransferBufferManager* manager = new TransferBufferManager(); |
| 48 transfer_buffer_manager_.reset(manager); | 48 transfer_buffer_manager_.reset(manager); |
| 49 EXPECT_TRUE(manager->Initialize()); | 49 EXPECT_TRUE(manager->Initialize()); |
| 50 } | 50 } |
| 51 | 51 |
| 52 command_buffer_.reset( | 52 command_buffer_.reset( |
| 53 new CommandBufferService(transfer_buffer_manager_.get())); | 53 new CommandBufferService(transfer_buffer_manager_.get(), |
| 54 NULL, |
| 55 NULL)); |
| 54 EXPECT_TRUE(command_buffer_->Initialize()); | 56 EXPECT_TRUE(command_buffer_->Initialize()); |
| 55 | 57 |
| 56 gpu_scheduler_.reset(new GpuScheduler( | 58 gpu_scheduler_.reset(new GpuScheduler( |
| 57 command_buffer_.get(), api_mock_.get(), NULL)); | 59 command_buffer_.get(), api_mock_.get(), NULL)); |
| 58 command_buffer_->SetPutOffsetChangeCallback(base::Bind( | 60 command_buffer_->SetPutOffsetChangeCallback(base::Bind( |
| 59 &GpuScheduler::PutChanged, base::Unretained(gpu_scheduler_.get()))); | 61 &GpuScheduler::PutChanged, base::Unretained(gpu_scheduler_.get()))); |
| 60 command_buffer_->SetGetBufferChangeCallback(base::Bind( | 62 command_buffer_->SetGetBufferChangeCallback(base::Bind( |
| 61 &GpuScheduler::SetGetBuffer, base::Unretained(gpu_scheduler_.get()))); | 63 &GpuScheduler::SetGetBuffer, base::Unretained(gpu_scheduler_.get()))); |
| 62 | 64 |
| 63 api_mock_->set_engine(gpu_scheduler_.get()); | 65 api_mock_->set_engine(gpu_scheduler_.get()); |
| (...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 300 ASSERT_TRUE(mem3); | 302 ASSERT_TRUE(mem3); |
| 301 EXPECT_NE(-1, id1); | 303 EXPECT_NE(-1, id1); |
| 302 EXPECT_EQ(id1, id2); | 304 EXPECT_EQ(id1, id2); |
| 303 EXPECT_NE(id2, id3); | 305 EXPECT_NE(id2, id3); |
| 304 EXPECT_EQ(0u, offset1); | 306 EXPECT_EQ(0u, offset1); |
| 305 EXPECT_EQ(kSize, offset2); | 307 EXPECT_EQ(kSize, offset2); |
| 306 EXPECT_EQ(0u, offset3); | 308 EXPECT_EQ(0u, offset3); |
| 307 } | 309 } |
| 308 | 310 |
| 309 } // namespace gpu | 311 } // namespace gpu |
| OLD | NEW |