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

Side by Side Diff: gpu/command_buffer/service/transfer_buffer_manager_unittest.cc

Issue 659183002: Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/service/transfer_buffer_manager.h" 5 #include "gpu/command_buffer/service/transfer_buffer_manager.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "testing/gtest/include/gtest/gtest.h" 8 #include "testing/gtest/include/gtest/gtest.h"
9 #include "testing/gmock/include/gmock/gmock.h" 9 #include "testing/gmock/include/gmock/gmock.h"
10 10
(...skipping 27 matching lines...) Expand all
38 } 38 }
39 39
40 TEST_F(TransferBufferManagerTest, CanRegisterTransferBuffer) { 40 TEST_F(TransferBufferManagerTest, CanRegisterTransferBuffer) {
41 scoped_ptr<base::SharedMemory> shm(new base::SharedMemory()); 41 scoped_ptr<base::SharedMemory> shm(new base::SharedMemory());
42 shm->CreateAndMapAnonymous(kBufferSize); 42 shm->CreateAndMapAnonymous(kBufferSize);
43 base::SharedMemory* shm_raw_pointer = shm.get(); 43 base::SharedMemory* shm_raw_pointer = shm.get();
44 scoped_ptr<SharedMemoryBufferBacking> backing( 44 scoped_ptr<SharedMemoryBufferBacking> backing(
45 new SharedMemoryBufferBacking(shm.Pass(), kBufferSize)); 45 new SharedMemoryBufferBacking(shm.Pass(), kBufferSize));
46 SharedMemoryBufferBacking* backing_raw_ptr = backing.get(); 46 SharedMemoryBufferBacking* backing_raw_ptr = backing.get();
47 47
48 EXPECT_TRUE(transfer_buffer_manager_->RegisterTransferBuffer( 48 EXPECT_TRUE(
49 1, backing.PassAs<BufferBacking>())); 49 transfer_buffer_manager_->RegisterTransferBuffer(1, backing.Pass()));
50 scoped_refptr<Buffer> registered = 50 scoped_refptr<Buffer> registered =
51 transfer_buffer_manager_->GetTransferBuffer(1); 51 transfer_buffer_manager_->GetTransferBuffer(1);
52 52
53 // Shared-memory ownership is transfered. It should be the same memory. 53 // Shared-memory ownership is transfered. It should be the same memory.
54 EXPECT_EQ(backing_raw_ptr, registered->backing()); 54 EXPECT_EQ(backing_raw_ptr, registered->backing());
55 EXPECT_EQ(shm_raw_pointer, backing_raw_ptr->shared_memory()); 55 EXPECT_EQ(shm_raw_pointer, backing_raw_ptr->shared_memory());
56 } 56 }
57 57
58 class FakeBufferBacking : public BufferBacking { 58 class FakeBufferBacking : public BufferBacking {
59 public: 59 public:
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 } 104 }
105 105
106 TEST_F(TransferBufferManagerTest, CannotRegisterNegativeTransferBufferId) { 106 TEST_F(TransferBufferManagerTest, CannotRegisterNegativeTransferBufferId) {
107 scoped_ptr<base::SharedMemory> shm(new base::SharedMemory()); 107 scoped_ptr<base::SharedMemory> shm(new base::SharedMemory());
108 shm->CreateAndMapAnonymous(kBufferSize); 108 shm->CreateAndMapAnonymous(kBufferSize);
109 EXPECT_FALSE(transfer_buffer_manager_->RegisterTransferBuffer( 109 EXPECT_FALSE(transfer_buffer_manager_->RegisterTransferBuffer(
110 -1, FakeBufferBacking::Make())); 110 -1, FakeBufferBacking::Make()));
111 } 111 }
112 112
113 } // namespace gpu 113 } // namespace gpu
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698