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

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

Issue 654223006: Cleanup GpuMemoryBuffer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: compile 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
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/browser/gpu/browser_gpu_memory_buffer_manager.h" 5 #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/debug/trace_event.h" 8 #include "base/debug/trace_event.h"
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "base/synchronization/waitable_event.h" 10 #include "base/synchronization/waitable_event.h"
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 103
104 gfx::GpuMemoryBuffer* 104 gfx::GpuMemoryBuffer*
105 BrowserGpuMemoryBufferManager::GpuMemoryBufferFromClientBuffer( 105 BrowserGpuMemoryBufferManager::GpuMemoryBufferFromClientBuffer(
106 ClientBuffer buffer) { 106 ClientBuffer buffer) {
107 return GpuMemoryBufferImpl::FromClientBuffer(buffer); 107 return GpuMemoryBufferImpl::FromClientBuffer(buffer);
108 } 108 }
109 109
110 void BrowserGpuMemoryBufferManager::ChildProcessDeletedGpuMemoryBuffer( 110 void BrowserGpuMemoryBufferManager::ChildProcessDeletedGpuMemoryBuffer(
111 gfx::GpuMemoryBufferType type, 111 gfx::GpuMemoryBufferType type,
112 const gfx::GpuMemoryBufferId& id, 112 const gfx::GpuMemoryBufferId& id,
113 base::ProcessHandle child_process_handle) { 113 base::ProcessHandle child_process_handle,
114 int child_client_id,
115 uint32 sync_point) {
114 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 116 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
115 117
116 GpuMemoryBufferImpl::DeletedByChildProcess(type, id, child_process_handle); 118 GpuMemoryBufferImpl::DeletedByChildProcess(type, id, child_process_handle,
119 child_client_id, sync_point);
reveman 2014/11/03 22:26:12 nit: is this formatted correctly?
117 } 120 }
118 121
119 void BrowserGpuMemoryBufferManager::ProcessRemoved( 122 void BrowserGpuMemoryBufferManager::ProcessRemoved(
120 base::ProcessHandle process_handle) { 123 base::ProcessHandle process_handle) {
121 // TODO(reveman): Handle child process removal correctly. 124 // TODO(reveman): Handle child process removal correctly.
122 } 125 }
123 126
124 // static 127 // static
125 void BrowserGpuMemoryBufferManager::AllocateGpuMemoryBufferOnIO( 128 void BrowserGpuMemoryBufferManager::AllocateGpuMemoryBufferOnIO(
126 AllocateGpuMemoryBufferRequest* request) { 129 AllocateGpuMemoryBufferRequest* request) {
127 GpuMemoryBufferImpl::Create( 130 GpuMemoryBufferImpl::Create(
128 request->size, 131 request->size,
129 request->format, 132 request->format,
130 request->usage, 133 request->usage,
131 request->client_id, 134 request->client_id,
132 base::Bind(&BrowserGpuMemoryBufferManager::GpuMemoryBufferCreatedOnIO, 135 base::Bind(&BrowserGpuMemoryBufferManager::GpuMemoryBufferCreatedOnIO,
133 base::Unretained(request))); 136 base::Unretained(request)));
134 } 137 }
135 138
136 // static 139 // static
137 void BrowserGpuMemoryBufferManager::GpuMemoryBufferCreatedOnIO( 140 void BrowserGpuMemoryBufferManager::GpuMemoryBufferCreatedOnIO(
138 AllocateGpuMemoryBufferRequest* request, 141 AllocateGpuMemoryBufferRequest* request,
139 scoped_ptr<GpuMemoryBufferImpl> buffer) { 142 scoped_ptr<GpuMemoryBufferImpl> buffer) {
140 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 143 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
141 144
142 request->result = buffer.Pass(); 145 request->result = buffer.Pass();
143 request->event.Signal(); 146 request->event.Signal();
144 } 147 }
145 148
149 void BrowserGpuMemoryBufferManager::RecordDestructionSyncPoint(
150 ClientBuffer buffer,
151 uint32 sync_point) {
152 GpuMemoryBufferImpl::FromClientBuffer(buffer)
153 ->set_destruction_sync_point(sync_point);
154 }
155
146 } // namespace content 156 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698