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

Unified Diff: ui/views/mus/surface_context_factory.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 | « ui/views/mus/surface_context_factory.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/mus/surface_context_factory.cc
diff --git a/ui/views/mus/surface_context_factory.cc b/ui/views/mus/surface_context_factory.cc
index 626038b5b0568dbd3badf1b726e73f20054a4792..ba29f460b795b0c128f253feb690d9dfdec8d090 100644
--- a/ui/views/mus/surface_context_factory.cc
+++ b/ui/views/mus/surface_context_factory.cc
@@ -41,9 +41,9 @@ void SurfaceContextFactory::CreateCompositorFrameSink(
ui::mojom::CompositorFrameSinkType compositor_frame_sink_type =
native_widget->compositor_frame_sink_type();
auto compositor_frame_sink = window->RequestCompositorFrameSink(
- compositor_frame_sink_type,
- make_scoped_refptr(
- new ui::ContextProvider(gpu_service_->EstablishGpuChannelSync())));
+ compositor_frame_sink_type, make_scoped_refptr(new ui::ContextProvider(
+ gpu_service_->EstablishGpuChannelSync())),
+ gpu_service_->gpu_memory_buffer_manager());
compositor->SetCompositorFrameSink(std::move(compositor_frame_sink));
}
@@ -78,11 +78,6 @@ uint32_t SurfaceContextFactory::GetImageTextureTarget(gfx::BufferFormat format,
return GL_TEXTURE_2D;
}
-cc::SharedBitmapManager* SurfaceContextFactory::GetSharedBitmapManager() {
- // NOTIMPLEMENTED();
- return nullptr;
-}
-
gpu::GpuMemoryBufferManager*
SurfaceContextFactory::GetGpuMemoryBufferManager() {
return gpu_service_->gpu_memory_buffer_manager();
« no previous file with comments | « ui/views/mus/surface_context_factory.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698