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

Unified Diff: ui/views/mus/surface_context_factory.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: 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..50ae575a3ea387bea6b0411721cf854d37426f94 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())),
+ GetGpuMemoryBufferManager());
danakj 2016/10/27 21:00:34 this could go to gpu_service_ right, do we need th
piman 2016/10/28 00:58:36 I changed to gpu_service_->gpu_memory_buffer_manag
danakj 2016/10/28 01:33:20 Was hoping the method could go away entirely but t
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();
« ui/compositor/test/in_process_context_factory.cc ('K') | « 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