Move GpuMemoryBufferManager and SharedBitmapManager to CompositorFrameSink

cc/output/compositor_frame_sink.h

 // Copyright 2012 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.
 
 #ifndef CC_OUTPUT_COMPOSITOR_FRAME_SINK_H_
 #define CC_OUTPUT_COMPOSITOR_FRAME_SINK_H_
 
 #include <deque>
 #include <memory>
 
@@ skipping 12 matching lines @@
 class LatencyInfo;
 }
 
 namespace gfx {
 class ColorSpace;
 class Rect;
 class Size;
 class Transform;
 }
 
+namespace gpu {
+class GpuMemoryBufferManager;
+}
+
 namespace cc {
 
 class CompositorFrame;
 struct ManagedMemoryPolicy;
 class CompositorFrameSinkClient;
+class SharedBitmapManager;
 
 // An interface for submitting CompositorFrames to a display compositor
 // which will compose frames from multiple CompositorFrameSinks to show
 // on screen to the user.
 // If a context_provider() is present, frames should be submitted with
 // OpenGL resources (created with the context_provider()). If not, then
 // SharedBitmap resources should be used.
 class CC_EXPORT CompositorFrameSink {
  public:
   struct Capabilities {
     Capabilities() = default;
 
     // Whether ForceReclaimResources can be called to reclaim all resources
     // from the CompositorFrameSink.
     bool can_force_reclaim_resources = false;
     // True if sync points for resources are needed when swapping delegated
     // frames.
     bool delegated_sync_points_required = true;
   };
 
   // Constructor for GL-based and/or software resources.
+  // gpu_memory_buffer_manager and shared_bitmap_manager must outlive the
+  // CompositorFrameSink.
+  // shared_bitmap_manager is optional (won't be used) if context_provider is

[danakj, 2016/10/27 21:00:34]

Maybe we should have 2 constructors at this point? This kinda logic is :/ (It's
fine for this CL)

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

So, that's what we used to have in the past iirc. The reason to coalesce them
was that having separate constructors here means separate/duplicated
constructors in derived classes (browser ones in particular) which was even more
:/

I suppose an alternative could be to make (pure) virtual accessors for each of
the fields, so that we're not constrained by the constructors, but I haven't
looked in detail at if it would really help or make things worse.
Another option is to pack all 4 of these (or 5 with Vulkan) into a separate
struct with 2 (3) constructors, so that the split happens at the construction
site?
Dunno if it's worth doing though.

+  // present.
+  // gpu_memory_buffer_manager is optional (won't be used) if context_provider
+  // is not present.
   CompositorFrameSink(scoped_refptr<ContextProvider> context_provider,
-                      scoped_refptr<ContextProvider> worker_context_provider);
+                      scoped_refptr<ContextProvider> worker_context_provider,
+                      gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
+                      SharedBitmapManager* shared_bitmap_manager);
 
   // Constructor for Vulkan-based resources.
   explicit CompositorFrameSink(
       scoped_refptr<VulkanContextProvider> vulkan_context_provider);
 
   virtual ~CompositorFrameSink();
 
   // Called by the compositor on the compositor thread. This is a place where
   // thread-specific data for the output surface can be initialized, since from
   // this point to when DetachFromClient() is called the output surface will
@@ skipping 15 matching lines @@
 
   // The ContextProviders may be null if frames should be submitted with
   // software SharedBitmap resources.
   ContextProvider* context_provider() const { return context_provider_.get(); }
   ContextProvider* worker_context_provider() const {
     return worker_context_provider_.get();
   }
   VulkanContextProvider* vulkan_context_provider() const {
     return vulkan_context_provider_.get();
   }
+  gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager() const {
+    return gpu_memory_buffer_manager_;
+  }
+  SharedBitmapManager* shared_bitmap_manager() const {
+    return shared_bitmap_manager_;
+  }
 
   // If supported, this causes a ReclaimResources for all resources that are
   // currently in use.
   virtual void ForceReclaimResources() {}
 
   // Support for a pull-model where draws are requested by the output surface.
   //
   // CompositorFrameSink::Invalidate is called by the compositor to notify that
   // there's new content.
   virtual void Invalidate() {}
 
   // For successful swaps, the implementation must call
   // DidReceiveCompositorFrameAck() asynchronously when the frame has been
   // processed in order to unthrottle the next frame.
   virtual void SubmitCompositorFrame(CompositorFrame frame) = 0;
 
  protected:
   // Bound to the ContextProvider to hear about when it is lost and inform the
   // |client_|.
   void DidLoseCompositorFrameSink();
 
   CompositorFrameSinkClient* client_ = nullptr;
 
   struct CompositorFrameSink::Capabilities capabilities_;
   scoped_refptr<ContextProvider> context_provider_;
   scoped_refptr<ContextProvider> worker_context_provider_;
   scoped_refptr<VulkanContextProvider> vulkan_context_provider_;
+  gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager_;
+  SharedBitmapManager* shared_bitmap_manager_;
   base::ThreadChecker client_thread_checker_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CompositorFrameSink);
 };
 
 }  // namespace cc
 
 #endif  // CC_OUTPUT_COMPOSITOR_FRAME_SINK_H_