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

Side by Side Diff: gpu/command_buffer/client/mapped_memory_unittest.cc

Issue 253943002: Remove CommandBuffer::GetState (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: I forgot Poland^Wmojo Created 6 years, 7 months 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 <list> 7 #include <list>
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 command_buffer_->SetGetBufferChangeCallback(base::Bind( 61 command_buffer_->SetGetBufferChangeCallback(base::Bind(
62 &GpuScheduler::SetGetBuffer, base::Unretained(gpu_scheduler_.get()))); 62 &GpuScheduler::SetGetBuffer, base::Unretained(gpu_scheduler_.get())));
63 63
64 api_mock_->set_engine(gpu_scheduler_.get()); 64 api_mock_->set_engine(gpu_scheduler_.get());
65 65
66 helper_.reset(new CommandBufferHelper(command_buffer_.get())); 66 helper_.reset(new CommandBufferHelper(command_buffer_.get()));
67 helper_->Initialize(kBufferSize); 67 helper_->Initialize(kBufferSize);
68 } 68 }
69 69
70 int32 GetToken() { 70 int32 GetToken() {
71 return command_buffer_->GetState().token; 71 return command_buffer_->GetLastState().token;
72 } 72 }
73 73
74 #if defined(OS_MACOSX) 74 #if defined(OS_MACOSX)
75 base::mac::ScopedNSAutoreleasePool autorelease_pool_; 75 base::mac::ScopedNSAutoreleasePool autorelease_pool_;
76 #endif 76 #endif
77 base::MessageLoop message_loop_; 77 base::MessageLoop message_loop_;
78 scoped_ptr<AsyncAPIMock> api_mock_; 78 scoped_ptr<AsyncAPIMock> api_mock_;
79 scoped_ptr<TransferBufferManagerInterface> transfer_buffer_manager_; 79 scoped_ptr<TransferBufferManagerInterface> transfer_buffer_manager_;
80 scoped_ptr<CommandBufferService> command_buffer_; 80 scoped_ptr<CommandBufferService> command_buffer_;
81 scoped_ptr<GpuScheduler> gpu_scheduler_; 81 scoped_ptr<GpuScheduler> gpu_scheduler_;
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
447 unsigned int offset3; 447 unsigned int offset3;
448 void* mem3 = manager_->Alloc(kSize, &id3, &offset3); 448 void* mem3 = manager_->Alloc(kSize, &id3, &offset3);
449 EXPECT_EQ(manager_->bytes_in_use(), kSize * 2); 449 EXPECT_EQ(manager_->bytes_in_use(), kSize * 2);
450 450
451 manager_->Free(mem2); 451 manager_->Free(mem2);
452 manager_->Free(mem3); 452 manager_->Free(mem3);
453 EXPECT_EQ(manager_->bytes_in_use(), static_cast<size_t>(0)); 453 EXPECT_EQ(manager_->bytes_in_use(), static_cast<size_t>(0));
454 } 454 }
455 455
456 } // namespace gpu 456 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/command_buffer/client/gles2_implementation_unittest.cc ('k') | gpu/command_buffer/client/ring_buffer_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698