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

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

Issue 1055403010: content: Add GpuMemoryBuffer MemoryDumpProvider implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: move register out of ifdef Created 5 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
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 "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "base/trace_event/memory_dump_provider.h"
10 #include "content/common/content_export.h" 11 #include "content/common/content_export.h"
11 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h" 12 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
12 13
13 namespace content { 14 namespace content {
14 class GpuMemoryBufferFactoryHost; 15 class GpuMemoryBufferFactoryHost;
15 class GpuMemoryBufferImpl; 16 class GpuMemoryBufferImpl;
16 17
17 class CONTENT_EXPORT BrowserGpuMemoryBufferManager 18 class CONTENT_EXPORT BrowserGpuMemoryBufferManager
18 : public gpu::GpuMemoryBufferManager { 19 : public gpu::GpuMemoryBufferManager,
20 public base::trace_event::MemoryDumpProvider {
19 public: 21 public:
20 typedef base::Callback<void(const gfx::GpuMemoryBufferHandle& handle)> 22 typedef base::Callback<void(const gfx::GpuMemoryBufferHandle& handle)>
21 AllocationCallback; 23 AllocationCallback;
22 24
23 BrowserGpuMemoryBufferManager( 25 BrowserGpuMemoryBufferManager(
24 GpuMemoryBufferFactoryHost* gpu_memory_buffer_factory_host, 26 GpuMemoryBufferFactoryHost* gpu_memory_buffer_factory_host,
25 int gpu_client_id); 27 int gpu_client_id);
26 ~BrowserGpuMemoryBufferManager() override; 28 ~BrowserGpuMemoryBufferManager() override;
27 29
28 static BrowserGpuMemoryBufferManager* current(); 30 static BrowserGpuMemoryBufferManager* current();
29 31
30 // Overridden from gpu::GpuMemoryBufferManager: 32 // Overridden from gpu::GpuMemoryBufferManager:
31 scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer( 33 scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer(
32 const gfx::Size& size, 34 const gfx::Size& size,
33 gfx::GpuMemoryBuffer::Format format, 35 gfx::GpuMemoryBuffer::Format format,
34 gfx::GpuMemoryBuffer::Usage usage) override; 36 gfx::GpuMemoryBuffer::Usage usage) override;
35 gfx::GpuMemoryBuffer* GpuMemoryBufferFromClientBuffer( 37 gfx::GpuMemoryBuffer* GpuMemoryBufferFromClientBuffer(
36 ClientBuffer buffer) override; 38 ClientBuffer buffer) override;
37 void SetDestructionSyncPoint(gfx::GpuMemoryBuffer* buffer, 39 void SetDestructionSyncPoint(gfx::GpuMemoryBuffer* buffer,
38 uint32 sync_point) override; 40 uint32 sync_point) override;
39 41
42 // Overridden from base::trace_event::MemoryDumpProvider:
43 bool OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd) override;
44
40 // Virtual for testing. 45 // Virtual for testing.
41 virtual scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBufferForScanout( 46 virtual scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBufferForScanout(
42 const gfx::Size& size, 47 const gfx::Size& size,
43 gfx::GpuMemoryBuffer::Format format, 48 gfx::GpuMemoryBuffer::Format format,
44 int32 surface_id); 49 int32 surface_id);
50
45 void AllocateGpuMemoryBufferForChildProcess( 51 void AllocateGpuMemoryBufferForChildProcess(
46 const gfx::Size& size, 52 const gfx::Size& size,
47 gfx::GpuMemoryBuffer::Format format, 53 gfx::GpuMemoryBuffer::Format format,
48 gfx::GpuMemoryBuffer::Usage usage, 54 gfx::GpuMemoryBuffer::Usage usage,
49 base::ProcessHandle child_process_handle, 55 base::ProcessHandle child_process_handle,
50 int child_client_id, 56 int child_client_id,
51 const AllocationCallback& callback); 57 const AllocationCallback& callback);
52 void ChildProcessDeletedGpuMemoryBuffer( 58 void ChildProcessDeletedGpuMemoryBuffer(
53 gfx::GpuMemoryBufferId id, 59 gfx::GpuMemoryBufferId id,
54 base::ProcessHandle child_process_handle, 60 base::ProcessHandle child_process_handle,
55 int child_client_id, 61 int child_client_id,
56 uint32 sync_point); 62 uint32 sync_point);
57 void ProcessRemoved(base::ProcessHandle process_handle, int client_id); 63 void ProcessRemoved(base::ProcessHandle process_handle, int client_id);
58 64
59 private: 65 private:
66 struct BufferInfo {
67 BufferInfo()
68 : format(gfx::GpuMemoryBuffer::RGBA_8888), type(gfx::EMPTY_BUFFER) {}
69 BufferInfo(const gfx::Size& size,
70 gfx::GpuMemoryBuffer::Format format,
71 gfx::GpuMemoryBufferType type)
72 : size(size), format(format), type(type) {}
73
74 gfx::Size size;
75 gfx::GpuMemoryBuffer::Format format;
76 gfx::GpuMemoryBufferType type;
77 };
60 struct AllocateGpuMemoryBufferRequest; 78 struct AllocateGpuMemoryBufferRequest;
61 79
62 scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBufferCommon( 80 scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBufferCommon(
63 const gfx::Size& size, 81 const gfx::Size& size,
64 gfx::GpuMemoryBuffer::Format format, 82 gfx::GpuMemoryBuffer::Format format,
65 gfx::GpuMemoryBuffer::Usage usage, 83 gfx::GpuMemoryBuffer::Usage usage,
66 int32 surface_id); 84 int32 surface_id);
67 void AllocateGpuMemoryBufferOnIO(AllocateGpuMemoryBufferRequest* request); 85 void AllocateGpuMemoryBufferOnIO(AllocateGpuMemoryBufferRequest* request);
68 void GpuMemoryBufferAllocatedOnIO(AllocateGpuMemoryBufferRequest* request, 86 void GpuMemoryBufferAllocatedOnIO(AllocateGpuMemoryBufferRequest* request,
69 const gfx::GpuMemoryBufferHandle& handle); 87 const gfx::GpuMemoryBufferHandle& handle);
70 void GpuMemoryBufferDeleted(gfx::GpuMemoryBufferId id, 88 void GpuMemoryBufferDeleted(gfx::GpuMemoryBufferId id,
71 int client_id, 89 int client_id,
72 uint32 sync_point); 90 uint32 sync_point);
73 void GpuMemoryBufferAllocatedForChildProcess( 91 void GpuMemoryBufferAllocatedForChildProcess(
74 int child_client_id, 92 int child_client_id,
75 const AllocationCallback& callback, 93 const AllocationCallback& callback,
76 const gfx::GpuMemoryBufferHandle& handle); 94 const gfx::GpuMemoryBufferHandle& handle);
77 95
78 GpuMemoryBufferFactoryHost* gpu_memory_buffer_factory_host_; 96 GpuMemoryBufferFactoryHost* gpu_memory_buffer_factory_host_;
79 int gpu_client_id_; 97 int gpu_client_id_;
80 98
81 typedef base::hash_map<gfx::GpuMemoryBufferId, gfx::GpuMemoryBufferType> 99 typedef base::hash_map<gfx::GpuMemoryBufferId, BufferInfo> BufferMap;
82 BufferMap;
83 typedef base::hash_map<int, BufferMap> ClientMap; 100 typedef base::hash_map<int, BufferMap> ClientMap;
84 ClientMap clients_; 101 ClientMap clients_;
85 102
86 base::WeakPtrFactory<BrowserGpuMemoryBufferManager> weak_ptr_factory_; 103 base::WeakPtrFactory<BrowserGpuMemoryBufferManager> weak_ptr_factory_;
87 104
88 DISALLOW_COPY_AND_ASSIGN(BrowserGpuMemoryBufferManager); 105 DISALLOW_COPY_AND_ASSIGN(BrowserGpuMemoryBufferManager);
89 }; 106 };
90 107
91 } // namespace content 108 } // namespace content
92 109
93 #endif // CONTENT_BROWSER_GPU_BROWSER_GPU_MEMORY_BUFFER_MANAGER_H_ 110 #endif // CONTENT_BROWSER_GPU_BROWSER_GPU_MEMORY_BUFFER_MANAGER_H_
OLDNEW
« no previous file with comments | « content/browser/browser_process_sub_thread.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