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

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

Issue 709433002: Revert of content: Cleanup GpuMemoryBuffers when child process is removed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gpu-memory-buffer-id-refactor
Patch Set: Created 6 years, 1 month 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/browser/gpu/browser_gpu_memory_buffer_manager.cc » ('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 #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 "base/callback.h" 8 #include "base/callback.h"
9 #include "content/common/content_export.h" 9 #include "content/common/content_export.h"
10 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h" 10 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
(...skipping 23 matching lines...) Expand all
34 uint32 sync_point) override; 34 uint32 sync_point) override;
35 35
36 void AllocateGpuMemoryBufferForChildProcess( 36 void AllocateGpuMemoryBufferForChildProcess(
37 const gfx::Size& size, 37 const gfx::Size& size,
38 gfx::GpuMemoryBuffer::Format format, 38 gfx::GpuMemoryBuffer::Format format,
39 gfx::GpuMemoryBuffer::Usage usage, 39 gfx::GpuMemoryBuffer::Usage usage,
40 base::ProcessHandle child_process_handle, 40 base::ProcessHandle child_process_handle,
41 int child_client_id, 41 int child_client_id,
42 const AllocationCallback& callback); 42 const AllocationCallback& callback);
43 void ChildProcessDeletedGpuMemoryBuffer( 43 void ChildProcessDeletedGpuMemoryBuffer(
44 gfx::GpuMemoryBufferType type,
44 gfx::GpuMemoryBufferId id, 45 gfx::GpuMemoryBufferId id,
45 base::ProcessHandle child_process_handle, 46 base::ProcessHandle child_process_handle,
46 int child_client_id, 47 int child_client_id,
47 uint32 sync_point); 48 uint32 sync_point);
48 void ProcessRemoved(base::ProcessHandle process_handle, int client_id); 49 void ProcessRemoved(base::ProcessHandle process_handle);
49 50
50 private: 51 private:
51 struct AllocateGpuMemoryBufferRequest; 52 struct AllocateGpuMemoryBufferRequest;
52 53
53 void GpuMemoryBufferAllocatedForChildProcess(
54 base::ProcessHandle child_process_handle,
55 int child_client_id,
56 const AllocationCallback& callback,
57 const gfx::GpuMemoryBufferHandle& handle);
58
59 static void AllocateGpuMemoryBufferOnIO( 54 static void AllocateGpuMemoryBufferOnIO(
60 AllocateGpuMemoryBufferRequest* request); 55 AllocateGpuMemoryBufferRequest* request);
61 static void GpuMemoryBufferCreatedOnIO( 56 static void GpuMemoryBufferCreatedOnIO(
62 AllocateGpuMemoryBufferRequest* request, 57 AllocateGpuMemoryBufferRequest* request,
63 scoped_ptr<GpuMemoryBufferImpl> buffer); 58 scoped_ptr<GpuMemoryBufferImpl> buffer);
64 59
65 int gpu_client_id_; 60 int gpu_client_id_;
66
67 typedef base::hash_map<gfx::GpuMemoryBufferId, gfx::GpuMemoryBufferType>
68 BufferMap;
69 typedef base::hash_map<int, BufferMap> ClientMap;
70 ClientMap clients_;
71
72 DISALLOW_COPY_AND_ASSIGN(BrowserGpuMemoryBufferManager);
73 }; 61 };
74 62
75 } // namespace content 63 } // namespace content
76 64
77 #endif // CONTENT_BROWSER_GPU_BROWSER_GPU_MEMORY_BUFFER_MANAGER_H_ 65 #endif // CONTENT_BROWSER_GPU_BROWSER_GPU_MEMORY_BUFFER_MANAGER_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/gpu/browser_gpu_memory_buffer_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698