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

Unified Diff: content/renderer/render_thread_impl.cc

Issue 2386913002: content: Remove gpu memory buffer manager from ChildThreadImpl. (Closed)
Patch Set: . Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/render_thread_impl.h ('k') | content/renderer/render_thread_impl_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_thread_impl.cc
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 7686bdf32144e79a0c091ceb4492a9464ebdc884..db117a4a20e90d47cbce8bca6502ea1524601fe0 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -655,6 +655,8 @@ void RenderThreadImpl::Init(
ChildProcess::current()->io_task_runner());
}
#endif
+ gpu_memory_buffer_manager_ =
+ base::MakeUnique<ChildGpuMemoryBufferManager>(thread_safe_sender());
InitializeWebKit(resource_task_queue);
@@ -1638,7 +1640,7 @@ gpu::GpuMemoryBufferManager* RenderThreadImpl::GetGpuMemoryBufferManager() {
if (gpu_service_)
return gpu_service_->gpu_memory_buffer_manager();
#endif
- return gpu_memory_buffer_manager();
+ return gpu_memory_buffer_manager_.get();
}
blink::scheduler::RendererScheduler* RenderThreadImpl::GetRendererScheduler() {
@@ -1857,7 +1859,7 @@ scoped_refptr<gpu::GpuChannelHost> RenderThreadImpl::EstablishGpuChannelSync() {
gpu_channel_ =
gpu::GpuChannelHost::Create(this, client_id, gpu_info, channel_handle,
ChildProcess::current()->GetShutDownEvent(),
- gpu_memory_buffer_manager());
+ GetGpuMemoryBufferManager());
} else {
#if defined(USE_AURA)
gpu_channel_ = gpu_service_->EstablishGpuChannelSync();
« no previous file with comments | « content/renderer/render_thread_impl.h ('k') | content/renderer/render_thread_impl_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698