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

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

Issue 290573011: Delay the response to ChildProcessHostMsg_SyncAllocateGpuMemoryBuffer via a callback to allow for b… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nits Created 6 years, 7 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 | Annotate | Revision Log
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_shm.h" 7 #include "content/common/gpu/client/gpu_memory_buffer_impl_shm.h"
8 8
9 namespace content { 9 namespace content {
10 10
(...skipping 14 matching lines...) Expand all
25 25
26 return scoped_ptr<GpuMemoryBufferImpl>(); 26 return scoped_ptr<GpuMemoryBufferImpl>();
27 } 27 }
28 28
29 // static 29 // static
30 void GpuMemoryBufferImpl::AllocateForChildProcess( 30 void GpuMemoryBufferImpl::AllocateForChildProcess(
31 const gfx::Size& size, 31 const gfx::Size& size,
32 unsigned internalformat, 32 unsigned internalformat,
33 unsigned usage, 33 unsigned usage,
34 base::ProcessHandle child_process, 34 base::ProcessHandle child_process,
35 gfx::GpuMemoryBufferHandle* handle) { 35 const AllocationCallback& callback) {
36 if (GpuMemoryBufferImplShm::IsConfigurationSupported( 36 if (GpuMemoryBufferImplShm::IsConfigurationSupported(
37 size, internalformat, usage)) { 37 size, internalformat, usage)) {
38 GpuMemoryBufferImplShm::AllocateSharedMemoryForChildProcess( 38 GpuMemoryBufferImplShm::AllocateSharedMemoryForChildProcess(
39 size, internalformat, child_process, handle); 39 size, internalformat, child_process, callback);
40 return; 40 return;
41 } 41 }
42 42
43 handle->type = gfx::EMPTY_BUFFER; 43 callback.Run(gfx::GpuMemoryBufferHandle());
44 } 44 }
45 45
46 // static 46 // static
47 scoped_ptr<GpuMemoryBufferImpl> GpuMemoryBufferImpl::CreateFromHandle( 47 scoped_ptr<GpuMemoryBufferImpl> GpuMemoryBufferImpl::CreateFromHandle(
48 gfx::GpuMemoryBufferHandle handle, 48 gfx::GpuMemoryBufferHandle handle,
49 const gfx::Size& size, 49 const gfx::Size& size,
50 unsigned internalformat) { 50 unsigned internalformat) {
51 switch (handle.type) { 51 switch (handle.type) {
52 case gfx::SHARED_MEMORY_BUFFER: { 52 case gfx::SHARED_MEMORY_BUFFER: {
53 scoped_ptr<GpuMemoryBufferImplShm> buffer( 53 scoped_ptr<GpuMemoryBufferImplShm> buffer(
54 new GpuMemoryBufferImplShm(size, internalformat)); 54 new GpuMemoryBufferImplShm(size, internalformat));
55 if (!buffer->InitializeFromHandle(handle)) 55 if (!buffer->InitializeFromHandle(handle))
56 return scoped_ptr<GpuMemoryBufferImpl>(); 56 return scoped_ptr<GpuMemoryBufferImpl>();
57 57
58 return buffer.PassAs<GpuMemoryBufferImpl>(); 58 return buffer.PassAs<GpuMemoryBufferImpl>();
59 } 59 }
60 default: 60 default:
61 return scoped_ptr<GpuMemoryBufferImpl>(); 61 return scoped_ptr<GpuMemoryBufferImpl>();
62 } 62 }
63 } 63 }
64 64
65 } // namespace content 65 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698