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

Unified Diff: blimp/client/core/compositor/blimp_compositor.cc

Issue 2452483002: Move GpuMemoryBufferManager and SharedBitmapManager to CompositorFrameSink (Closed)
Patch Set: compile fixes 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
Index: blimp/client/core/compositor/blimp_compositor.cc
diff --git a/blimp/client/core/compositor/blimp_compositor.cc b/blimp/client/core/compositor/blimp_compositor.cc
index 9fa2d525a905e470888d9d2ab5a558b4898e8638..c0b92f86f7380affff6e68d90577fbdf539c09ac 100644
--- a/blimp/client/core/compositor/blimp_compositor.cc
+++ b/blimp/client/core/compositor/blimp_compositor.cc
@@ -189,8 +189,9 @@ void BlimpCompositor::OnContextProvidersCreated(
auto compositor_frame_sink = base::MakeUnique<BlimpCompositorFrameSink>(
std::move(compositor_context_provider),
- std::move(worker_context_provider), base::ThreadTaskRunnerHandle::Get(),
- weak_ptr_factory_.GetWeakPtr());
+ std::move(worker_context_provider),
+ GetEmbedderDeps()->GetGpuMemoryBufferManager(), nullptr,
+ base::ThreadTaskRunnerHandle::Get(), weak_ptr_factory_.GetWeakPtr());
host_->SetCompositorFrameSink(std::move(compositor_frame_sink));
}
@@ -293,8 +294,6 @@ void BlimpCompositor::CreateLayerTreeHost() {
cc::LayerTreeHostInProcess::InitParams params;
params.client = this;
params.task_graph_runner = compositor_dependencies_->GetTaskGraphRunner();
- params.gpu_memory_buffer_manager =
- GetEmbedderDeps()->GetGpuMemoryBufferManager();
params.main_task_runner = base::ThreadTaskRunnerHandle::Get();
params.image_serialization_processor =
compositor_dependencies_->GetImageSerializationProcessor();
« no previous file with comments | « no previous file | blimp/client/core/compositor/blimp_compositor_frame_sink.h » ('j') | cc/layers/layer_perftest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698