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

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

Issue 2452483002: Move GpuMemoryBufferManager and SharedBitmapManager to CompositorFrameSink (Closed)
Patch Set: rebase 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 | « no previous file | blimp/client/core/compositor/blimp_compositor_frame_sink.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 2866c44682eebb89be95e2cab08c6f1c05543d3c..54dc7aaf78f0a917d7bb7ce095fe7e9493a26307 100644
--- a/blimp/client/core/compositor/blimp_compositor.cc
+++ b/blimp/client/core/compositor/blimp_compositor.cc
@@ -241,8 +241,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));
}
@@ -363,8 +364,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();
if (!use_threaded_layer_tree_host_) {
params.image_serialization_processor =
« no previous file with comments | « no previous file | blimp/client/core/compositor/blimp_compositor_frame_sink.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698