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

Side by Side Diff: content/browser/gpu/browser_gpu_memory_buffer_manager.h

Issue 1280513002: Add GenericSharedMemoryId and use w/ GpuMemoryBuffer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@trackpools
Patch Set: remove "tracing" from name Created 5 years, 4 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 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 #ifndef CONTENT_BROWSER_GPU_BROWSER_GPU_MEMORY_BUFFER_MANAGER_H_ 5 #ifndef CONTENT_BROWSER_GPU_BROWSER_GPU_MEMORY_BUFFER_MANAGER_H_
6 #define CONTENT_BROWSER_GPU_BROWSER_GPU_MEMORY_BUFFER_MANAGER_H_ 6 #define CONTENT_BROWSER_GPU_BROWSER_GPU_MEMORY_BUFFER_MANAGER_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 bool OnMemoryDump(const base::trace_event::MemoryDumpArgs& args, 45 bool OnMemoryDump(const base::trace_event::MemoryDumpArgs& args,
46 base::trace_event::ProcessMemoryDump* pmd) override; 46 base::trace_event::ProcessMemoryDump* pmd) override;
47 47
48 // Virtual for testing. 48 // Virtual for testing.
49 virtual scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBufferForScanout( 49 virtual scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBufferForScanout(
50 const gfx::Size& size, 50 const gfx::Size& size,
51 gfx::BufferFormat format, 51 gfx::BufferFormat format,
52 int32 surface_id); 52 int32 surface_id);
53 53
54 void AllocateGpuMemoryBufferForChildProcess( 54 void AllocateGpuMemoryBufferForChildProcess(
55 gfx::GpuMemoryBufferId id,
55 const gfx::Size& size, 56 const gfx::Size& size,
56 gfx::BufferFormat format, 57 gfx::BufferFormat format,
57 gfx::BufferUsage usage, 58 gfx::BufferUsage usage,
58 base::ProcessHandle child_process_handle, 59 base::ProcessHandle child_process_handle,
59 int child_client_id, 60 int child_client_id,
60 const AllocationCallback& callback); 61 const AllocationCallback& callback);
61 void ChildProcessDeletedGpuMemoryBuffer( 62 void ChildProcessDeletedGpuMemoryBuffer(
62 gfx::GpuMemoryBufferId id, 63 gfx::GpuMemoryBufferId id,
63 base::ProcessHandle child_process_handle, 64 base::ProcessHandle child_process_handle,
64 int child_client_id, 65 int child_client_id,
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 using BufferMap = base::hash_map<gfx::GpuMemoryBufferId, BufferInfo>; 139 using BufferMap = base::hash_map<gfx::GpuMemoryBufferId, BufferInfo>;
139 using ClientMap = base::hash_map<int, BufferMap>; 140 using ClientMap = base::hash_map<int, BufferMap>;
140 ClientMap clients_; 141 ClientMap clients_;
141 142
142 DISALLOW_COPY_AND_ASSIGN(BrowserGpuMemoryBufferManager); 143 DISALLOW_COPY_AND_ASSIGN(BrowserGpuMemoryBufferManager);
143 }; 144 };
144 145
145 } // namespace content 146 } // namespace content
146 147
147 #endif // CONTENT_BROWSER_GPU_BROWSER_GPU_MEMORY_BUFFER_MANAGER_H_ 148 #endif // CONTENT_BROWSER_GPU_BROWSER_GPU_MEMORY_BUFFER_MANAGER_H_
OLDNEW
« no previous file with comments | « content/browser/compositor/buffer_queue_unittest.cc ('k') | content/browser/gpu/browser_gpu_memory_buffer_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698