Move GpuMemoryBufferManager and SharedBitmapManager to CompositorFrameSink

ui/views/mus/surface_context_factory.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/mus/surface_context_factory.h"
 
 #include "base/memory/ptr_util.h"
 #include "cc/resources/shared_bitmap_manager.h"
 #include "cc/surfaces/surface_id_allocator.h"
 #include "services/ui/public/cpp/context_provider.h"
@@ skipping 23 matching lines @@
 
 SurfaceContextFactory::~SurfaceContextFactory() {}
 
 void SurfaceContextFactory::CreateCompositorFrameSink(
     base::WeakPtr<ui::Compositor> compositor) {
   ui::Window* window = compositor->window();
   NativeWidgetMus* native_widget = NativeWidgetMus::GetForWindow(window);
   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 this in the API?

[piman, 2016/10/28 00:58:36]

I changed to gpu_service_->gpu_memory_buffer_manager() here (is that what you
were looking for?). GetGpuMemoryBufferManager needs to exist because of exo (see
above)

[danakj, 2016/10/28 01:33:20]

Was hoping the method could go away entirely but thanks for the explanation.

   compositor->SetCompositorFrameSink(std::move(compositor_frame_sink));
 }
 
 std::unique_ptr<ui::Reflector> SurfaceContextFactory::CreateReflector(
     ui::Compositor* mirroed_compositor,
     ui::Layer* mirroring_layer) {
   // NOTIMPLEMENTED();
   return base::WrapUnique(new FakeReflector);
 }
 
@@ skipping 14 matching lines @@
 bool SurfaceContextFactory::DoesCreateTestContexts() {
   return false;
 }
 
 uint32_t SurfaceContextFactory::GetImageTextureTarget(gfx::BufferFormat format,
                                                       gfx::BufferUsage usage) {
   // No GpuMemoryBuffer support, so just return GL_TEXTURE_2D.
   return GL_TEXTURE_2D;
 }
 
-cc::SharedBitmapManager* SurfaceContextFactory::GetSharedBitmapManager() {
-  // NOTIMPLEMENTED();
-  return nullptr;
-}
-
 gpu::GpuMemoryBufferManager*
 SurfaceContextFactory::GetGpuMemoryBufferManager() {
   return gpu_service_->gpu_memory_buffer_manager();
 }
 
 cc::TaskGraphRunner* SurfaceContextFactory::GetTaskGraphRunner() {
   return raster_thread_helper_.task_graph_runner();
 }
 
 cc::FrameSinkId SurfaceContextFactory::AllocateFrameSinkId() {
   return cc::FrameSinkId(0, next_sink_id_++);
 }
 
 cc::SurfaceManager* SurfaceContextFactory::GetSurfaceManager() {
   return &surface_manager_;
 }
 
 void SurfaceContextFactory::SetDisplayVisible(ui::Compositor* compositor,
                                               bool visible) {
   // TODO(fsamuel): display[compositor]->SetVisible(visible);
 }
 
 void SurfaceContextFactory::ResizeDisplay(ui::Compositor* compositor,
                                           const gfx::Size& size) {
   // TODO(fsamuel): display[compositor]->Resize(size);
 }
 
 }  // namespace views