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

Side by Side Diff: content/common/gpu/client/gpu_memory_buffer_impl_linux.cc

Issue 600693002: content: Cleanup GpuMemoryBufferImpl destruction. (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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "content/common/gpu/client/gpu_memory_buffer_impl.h" 5 #include "content/common/gpu/client/gpu_memory_buffer_impl.h"
6 6
7 #include "content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.h" 7 #include "content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.h"
8 8
9 namespace content { 9 namespace content {
10 10
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 void GpuMemoryBufferImpl::DeletedByChildProcess( 46 void GpuMemoryBufferImpl::DeletedByChildProcess(
47 gfx::GpuMemoryBufferType type, 47 gfx::GpuMemoryBufferType type,
48 const gfx::GpuMemoryBufferId& id, 48 const gfx::GpuMemoryBufferId& id,
49 base::ProcessHandle child_process) { 49 base::ProcessHandle child_process) {
50 } 50 }
51 51
52 // static 52 // static
53 scoped_ptr<GpuMemoryBufferImpl> GpuMemoryBufferImpl::CreateFromHandle( 53 scoped_ptr<GpuMemoryBufferImpl> GpuMemoryBufferImpl::CreateFromHandle(
54 const gfx::GpuMemoryBufferHandle& handle, 54 const gfx::GpuMemoryBufferHandle& handle,
55 const gfx::Size& size, 55 const gfx::Size& size,
56 unsigned internalformat) { 56 unsigned internalformat,
57 const DestructionCallback& callback) {
57 switch (handle.type) { 58 switch (handle.type) {
58 case gfx::SHARED_MEMORY_BUFFER: { 59 case gfx::SHARED_MEMORY_BUFFER: {
59 scoped_ptr<GpuMemoryBufferImplSharedMemory> buffer( 60 scoped_ptr<GpuMemoryBufferImplSharedMemory> buffer(
60 new GpuMemoryBufferImplSharedMemory(size, internalformat)); 61 new GpuMemoryBufferImplSharedMemory(size, internalformat, callback));
61 if (!buffer->InitializeFromHandle(handle)) 62 if (!buffer->InitializeFromHandle(handle))
62 return scoped_ptr<GpuMemoryBufferImpl>(); 63 return scoped_ptr<GpuMemoryBufferImpl>();
63 64
64 return buffer.PassAs<GpuMemoryBufferImpl>(); 65 return buffer.PassAs<GpuMemoryBufferImpl>();
65 } 66 }
66 default: 67 default:
67 return scoped_ptr<GpuMemoryBufferImpl>(); 68 return scoped_ptr<GpuMemoryBufferImpl>();
68 } 69 }
69 } 70 }
70 71
71 } // namespace content 72 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698