Skip to content

Commit

Permalink
Replace .Pass() with std::move in gpu/ dir
Browse files Browse the repository at this point in the history
BUG=557422

Review URL: https://codereview.chromium.org/1528983003

Cr-Commit-Position: refs/heads/master@{#365790}
  • Loading branch information
martina.kollarova authored and Commit bot committed Dec 17, 2015
1 parent 8cb7685 commit a24873c
Show file tree
Hide file tree
Showing 12 changed files with 22 additions and 20 deletions.
2 changes: 1 addition & 1 deletion gpu/command_buffer/client/client_test_helper.cc
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ scoped_refptr<gpu::Buffer> MockCommandBufferBase::CreateTransferBuffer(
scoped_ptr<base::SharedMemory> shared_memory(new base::SharedMemory());
shared_memory->CreateAndMapAnonymous(size);
transfer_buffer_buffers_[ndx] =
MakeBufferFromSharedMemory(shared_memory.Pass(), size);
MakeBufferFromSharedMemory(std::move(shared_memory), size);
}
return GetTransferBuffer(*id);
}
Expand Down
2 changes: 1 addition & 1 deletion gpu/command_buffer/client/mapped_memory_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ class MemoryChunkTest : public MappedMemoryTestBase {
MappedMemoryTestBase::SetUp();
scoped_ptr<base::SharedMemory> shared_memory(new base::SharedMemory());
shared_memory->CreateAndMapAnonymous(kBufferSize);
buffer_ = MakeBufferFromSharedMemory(shared_memory.Pass(), kBufferSize);
buffer_ = MakeBufferFromSharedMemory(std::move(shared_memory), kBufferSize);
chunk_.reset(new MemoryChunk(kShmId, buffer_, helper_.get()));
}

Expand Down
4 changes: 2 additions & 2 deletions gpu/command_buffer/common/buffer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace gpu {
SharedMemoryBufferBacking::SharedMemoryBufferBacking(
scoped_ptr<base::SharedMemory> shared_memory,
size_t size)
: shared_memory_(shared_memory.Pass()), size_(size) {}
: shared_memory_(std::move(shared_memory)), size_(size) {}

SharedMemoryBufferBacking::~SharedMemoryBufferBacking() {}

Expand All @@ -24,7 +24,7 @@ void* SharedMemoryBufferBacking::GetMemory() const {
size_t SharedMemoryBufferBacking::GetSize() const { return size_; }

Buffer::Buffer(scoped_ptr<BufferBacking> backing)
: backing_(backing.Pass()),
: backing_(std::move(backing)),
memory_(backing_->GetMemory()),
size_(backing_->GetSize()) {
DCHECK(memory_) << "The memory must be mapped to create a Buffer";
Expand Down
5 changes: 3 additions & 2 deletions gpu/command_buffer/common/buffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,14 @@ static inline scoped_ptr<BufferBacking> MakeBackingFromSharedMemory(
scoped_ptr<base::SharedMemory> shared_memory,
size_t size) {
return scoped_ptr<BufferBacking>(
new SharedMemoryBufferBacking(shared_memory.Pass(), size));
new SharedMemoryBufferBacking(std::move(shared_memory), size));
}

static inline scoped_refptr<Buffer> MakeBufferFromSharedMemory(
scoped_ptr<base::SharedMemory> shared_memory,
size_t size) {
return new Buffer(MakeBackingFromSharedMemory(shared_memory.Pass(), size));
return new Buffer(
MakeBackingFromSharedMemory(std::move(shared_memory), size));
}

// Generates GUID which can be used to trace buffer using an Id.
Expand Down
7 changes: 4 additions & 3 deletions gpu/command_buffer/service/command_buffer_service.cc
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ void CommandBufferService::SetGetBuffer(int32 transfer_buffer_id) {

void CommandBufferService::SetSharedStateBuffer(
scoped_ptr<BufferBacking> shared_state_buffer) {
shared_state_buffer_ = shared_state_buffer.Pass();
shared_state_buffer_ = std::move(shared_state_buffer);
DCHECK(shared_state_buffer_->GetSize() >= sizeof(*shared_state_));

shared_state_ =
Expand Down Expand Up @@ -132,7 +132,7 @@ scoped_refptr<Buffer> CommandBufferService::CreateTransferBuffer(size_t size,
*id = next_id++;

if (!RegisterTransferBuffer(
*id, MakeBackingFromSharedMemory(shared_memory.Pass(), size))) {
*id, MakeBackingFromSharedMemory(std::move(shared_memory), size))) {
if (error_ == error::kNoError)
error_ = gpu::error::kOutOfBounds;
*id = -1;
Expand Down Expand Up @@ -160,7 +160,8 @@ scoped_refptr<Buffer> CommandBufferService::GetTransferBuffer(int32 id) {
bool CommandBufferService::RegisterTransferBuffer(
int32 id,
scoped_ptr<BufferBacking> buffer) {
return transfer_buffer_manager_->RegisterTransferBuffer(id, buffer.Pass());
return transfer_buffer_manager_->RegisterTransferBuffer(id,
std::move(buffer));
}

void CommandBufferService::SetToken(int32 token) {
Expand Down
2 changes: 1 addition & 1 deletion gpu/command_buffer/service/common_decoder_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class MockCommandBufferEngine : public CommandBufferEngine {
get_offset_(0) {
scoped_ptr<base::SharedMemory> shared_memory(new base::SharedMemory());
shared_memory->CreateAndMapAnonymous(kBufferSize);
buffer_ = MakeBufferFromSharedMemory(shared_memory.Pass(), kBufferSize);
buffer_ = MakeBufferFromSharedMemory(std::move(shared_memory), kBufferSize);
}

// Overridden from CommandBufferEngine.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1897,7 +1897,7 @@ MockCommandBufferEngine() {

scoped_ptr<base::SharedMemory> shm(new base::SharedMemory());
shm->CreateAndMapAnonymous(kSharedBufferSize);
valid_buffer_ = MakeBufferFromSharedMemory(shm.Pass(), kSharedBufferSize);
valid_buffer_ = MakeBufferFromSharedMemory(std::move(shm), kSharedBufferSize);

ClearSharedMemory();
}
Expand Down
2 changes: 1 addition & 1 deletion gpu/command_buffer/service/gpu_scheduler_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class GpuSchedulerTest : public testing::Test {
shared_memory->CreateAndMapAnonymous(kRingBufferSize);
buffer_ = static_cast<int32*>(shared_memory->memory());
shared_memory_buffer_ =
MakeBufferFromSharedMemory(shared_memory.Pass(), kRingBufferSize);
MakeBufferFromSharedMemory(std::move(shared_memory), kRingBufferSize);
memset(buffer_, 0, kRingBufferSize);

command_buffer_.reset(new MockCommandBuffer);
Expand Down
2 changes: 1 addition & 1 deletion gpu/command_buffer/service/in_process_command_buffer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ bool InProcessCommandBuffer::InitializeOnGpuThread(
new GpuScheduler(command_buffer.get(), decoder_.get(), decoder_.get()));
command_buffer->SetGetBufferChangeCallback(base::Bind(
&GpuScheduler::SetGetBuffer, base::Unretained(gpu_scheduler_.get())));
command_buffer_ = command_buffer.Pass();
command_buffer_ = std::move(command_buffer);

decoder_->set_engine(gpu_scheduler_.get());

Expand Down
8 changes: 4 additions & 4 deletions gpu/command_buffer/service/query_manager_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -101,13 +101,13 @@ class QueryManagerTest : public GpuServiceTest {
MockCommandBufferEngine() {
scoped_ptr<base::SharedMemory> shared_memory(new base::SharedMemory());
shared_memory->CreateAndMapAnonymous(kSharedBufferSize);
valid_buffer_ =
MakeBufferFromSharedMemory(shared_memory.Pass(), kSharedBufferSize);
valid_buffer_ = MakeBufferFromSharedMemory(std::move(shared_memory),
kSharedBufferSize);

scoped_ptr<base::SharedMemory> shared_memory2(new base::SharedMemory());
shared_memory2->CreateAndMapAnonymous(kSharedBufferSize);
valid_buffer2_ =
MakeBufferFromSharedMemory(shared_memory2.Pass(), kSharedBufferSize);
valid_buffer2_ = MakeBufferFromSharedMemory(std::move(shared_memory2),
kSharedBufferSize);

ClearSharedMemory();
}
Expand Down
2 changes: 1 addition & 1 deletion gpu/command_buffer/service/transfer_buffer_manager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ bool TransferBufferManager::RegisterTransferBuffer(
}

// Register the shared memory with the ID.
scoped_refptr<Buffer> buffer(new gpu::Buffer(buffer_backing.Pass()));
scoped_refptr<Buffer> buffer(new gpu::Buffer(std::move(buffer_backing)));

// Check buffer alignment is sane.
DCHECK(!(reinterpret_cast<uintptr_t>(buffer->memory()) &
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ TEST_F(TransferBufferManagerTest, CanRegisterTransferBuffer) {
shm->CreateAndMapAnonymous(kBufferSize);
base::SharedMemory* shm_raw_pointer = shm.get();
scoped_ptr<SharedMemoryBufferBacking> backing(
new SharedMemoryBufferBacking(shm.Pass(), kBufferSize));
new SharedMemoryBufferBacking(std::move(shm), kBufferSize));
SharedMemoryBufferBacking* backing_raw_ptr = backing.get();

EXPECT_TRUE(
transfer_buffer_manager_->RegisterTransferBuffer(1, backing.Pass()));
transfer_buffer_manager_->RegisterTransferBuffer(1, std::move(backing)));
scoped_refptr<Buffer> registered =
transfer_buffer_manager_->GetTransferBuffer(1);

Expand Down

0 comments on commit a24873c

Please sign in to comment.