projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 7.36.149.0
[platform/framework/web/crosswalk.git]
/
src
/
gpu
/
command_buffer
/
service
/
transfer_buffer_manager.cc
diff --git
a/src/gpu/command_buffer/service/transfer_buffer_manager.cc
b/src/gpu/command_buffer/service/transfer_buffer_manager.cc
index
7f81115
..
4404a9e
100644
(file)
--- a/
src/gpu/command_buffer/service/transfer_buffer_manager.cc
+++ b/
src/gpu/command_buffer/service/transfer_buffer_manager.cc
@@
-40,8
+40,7
@@
bool TransferBufferManager::Initialize() {
bool TransferBufferManager::RegisterTransferBuffer(
int32 id,
bool TransferBufferManager::RegisterTransferBuffer(
int32 id,
- scoped_ptr<base::SharedMemory> shared_memory,
- size_t size) {
+ scoped_ptr<BufferBacking> buffer_backing) {
if (id <= 0) {
DVLOG(0) << "Cannot register transfer buffer with non-positive ID.";
return false;
if (id <= 0) {
DVLOG(0) << "Cannot register transfer buffer with non-positive ID.";
return false;
@@
-54,13
+53,13
@@
bool TransferBufferManager::RegisterTransferBuffer(
}
// Register the shared memory with the ID.
}
// Register the shared memory with the ID.
- scoped_refptr<Buffer> buffer
= new gpu::Buffer(shared_memory.Pass(), size
);
+ scoped_refptr<Buffer> buffer
(new gpu::Buffer(buffer_backing.Pass())
);
// Check buffer alignment is sane.
DCHECK(!(reinterpret_cast<uintptr_t>(buffer->memory()) &
(kCommandBufferEntrySize - 1)));
// Check buffer alignment is sane.
DCHECK(!(reinterpret_cast<uintptr_t>(buffer->memory()) &
(kCommandBufferEntrySize - 1)));
- shared_memory_bytes_allocated_ +=
size
;
+ shared_memory_bytes_allocated_ +=
buffer->size()
;
TRACE_COUNTER_ID1(
"gpu", "GpuTransferBufferMemory", this, shared_memory_bytes_allocated_);
TRACE_COUNTER_ID1(
"gpu", "GpuTransferBufferMemory", this, shared_memory_bytes_allocated_);