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

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

Issue 8586048: base::Bind() conversion for remaining GPU files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #include "base/callback.h" 6 #include "base/bind.h"
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "gpu/command_buffer/client/cmd_buffer_helper.h" 9 #include "gpu/command_buffer/client/cmd_buffer_helper.h"
10 #include "gpu/command_buffer/service/mocks.h" 10 #include "gpu/command_buffer/service/mocks.h"
11 #include "gpu/command_buffer/service/command_buffer_service.h" 11 #include "gpu/command_buffer/service/command_buffer_service.h"
12 #include "gpu/command_buffer/service/gpu_scheduler.h" 12 #include "gpu/command_buffer/service/gpu_scheduler.h"
13 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
14 14
15 #if defined(OS_MACOSX) 15 #if defined(OS_MACOSX)
16 #include "base/mac/scoped_nsautorelease_pool.h" 16 #include "base/mac/scoped_nsautorelease_pool.h"
(...skipping 30 matching lines...) Expand all
47 47
48 parser_ = new CommandParser(ring_buffer.ptr, 48 parser_ = new CommandParser(ring_buffer.ptr,
49 ring_buffer.size, 49 ring_buffer.size,
50 0, 50 0,
51 ring_buffer.size, 51 ring_buffer.size,
52 0, 52 0,
53 api_mock_.get()); 53 api_mock_.get());
54 54
55 gpu_scheduler_.reset(new GpuScheduler( 55 gpu_scheduler_.reset(new GpuScheduler(
56 command_buffer_.get(), NULL, parser_)); 56 command_buffer_.get(), NULL, parser_));
57 command_buffer_->SetPutOffsetChangeCallback(NewCallback( 57 command_buffer_->SetPutOffsetChangeCallback(base::Bind(
58 gpu_scheduler_.get(), &GpuScheduler::PutChanged)); 58 &GpuScheduler::PutChanged, base::Unretained(gpu_scheduler_.get())));
59 59
60 api_mock_->set_engine(gpu_scheduler_.get()); 60 api_mock_->set_engine(gpu_scheduler_.get());
61 61
62 helper_.reset(new CommandBufferHelper(command_buffer_.get())); 62 helper_.reset(new CommandBufferHelper(command_buffer_.get()));
63 helper_->Initialize(kBufferSize); 63 helper_->Initialize(kBufferSize);
64 } 64 }
65 65
66 int32 GetToken() { 66 int32 GetToken() {
67 return command_buffer_->GetState().token; 67 return command_buffer_->GetState().token;
68 } 68 }
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 ASSERT_TRUE(mem3); 297 ASSERT_TRUE(mem3);
298 EXPECT_NE(-1, id1); 298 EXPECT_NE(-1, id1);
299 EXPECT_EQ(id1, id2); 299 EXPECT_EQ(id1, id2);
300 EXPECT_NE(id2, id3); 300 EXPECT_NE(id2, id3);
301 EXPECT_EQ(0u, offset1); 301 EXPECT_EQ(0u, offset1);
302 EXPECT_EQ(kSize, offset2); 302 EXPECT_EQ(kSize, offset2);
303 EXPECT_EQ(0u, offset3); 303 EXPECT_EQ(0u, offset3);
304 } 304 }
305 305
306 } // namespace gpu 306 } // namespace gpu
307
308
OLDNEW
« no previous file with comments | « gpu/command_buffer/client/fenced_allocator_test.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