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

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

Issue 596833002: content: Fix layering violation in GpuMemoryBufferImplOzoneNativeBuffer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix another typo 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 | content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_ozone_native_buffer.h " 7 #include "content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.h "
8 #include "content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.h" 8 #include "content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.h"
9 9
10 namespace content { 10 namespace content {
(...skipping 24 matching lines...) Expand all
35 // static 35 // static
36 void GpuMemoryBufferImpl::AllocateForChildProcess( 36 void GpuMemoryBufferImpl::AllocateForChildProcess(
37 const gfx::Size& size, 37 const gfx::Size& size,
38 unsigned internalformat, 38 unsigned internalformat,
39 unsigned usage, 39 unsigned usage,
40 base::ProcessHandle child_process, 40 base::ProcessHandle child_process,
41 int child_client_id, 41 int child_client_id,
42 const AllocationCallback& callback) { 42 const AllocationCallback& callback) {
43 if (GpuMemoryBufferImplOzoneNativeBuffer::IsConfigurationSupported( 43 if (GpuMemoryBufferImplOzoneNativeBuffer::IsConfigurationSupported(
44 internalformat, usage)) { 44 internalformat, usage)) {
45 GpuMemoryBufferImplOzoneNativeBuffer::AllocateOzoneNativeBufferForChildId( 45 GpuMemoryBufferImplOzoneNativeBuffer::
46 size, internalformat, usage, child_client_id, callback); 46 AllocateOzoneNativeBufferForChildProcess(
47 size, internalformat, usage, child_client_id, callback);
47 return; 48 return;
48 } 49 }
49 if (GpuMemoryBufferImplSharedMemory::IsConfigurationSupported( 50 if (GpuMemoryBufferImplSharedMemory::IsConfigurationSupported(
50 size, internalformat, usage)) { 51 size, internalformat, usage)) {
51 GpuMemoryBufferImplSharedMemory::AllocateSharedMemoryForChildProcess( 52 GpuMemoryBufferImplSharedMemory::AllocateSharedMemoryForChildProcess(
52 size, internalformat, child_process, callback); 53 size, internalformat, child_process, callback);
53 return; 54 return;
54 } 55 }
55 56
56 callback.Run(gfx::GpuMemoryBufferHandle()); 57 callback.Run(gfx::GpuMemoryBufferHandle());
(...skipping 27 matching lines...) Expand all
84 return scoped_ptr<GpuMemoryBufferImpl>(); 85 return scoped_ptr<GpuMemoryBufferImpl>();
85 86
86 return buffer.PassAs<GpuMemoryBufferImpl>(); 87 return buffer.PassAs<GpuMemoryBufferImpl>();
87 } 88 }
88 default: 89 default:
89 return scoped_ptr<GpuMemoryBufferImpl>(); 90 return scoped_ptr<GpuMemoryBufferImpl>();
90 } 91 }
91 } 92 }
92 93
93 } // namespace content 94 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698