Manage OffscreenCanvasCompositorFrameSink lifetime explicitly

content/browser/renderer_host/offscreen_canvas_compositor_frame_sink_provider_impl.h

Index: content/browser/renderer_host/offscreen_canvas_compositor_frame_sink_provider_impl.h
diff --git a/content/browser/renderer_host/offscreen_canvas_compositor_frame_sink_provider_impl.h b/content/browser/renderer_host/offscreen_canvas_compositor_frame_sink_provider_impl.h
index 2a6bceb3fc5a30099d734246bfbca17225ec7e31..d36c1aea1771c97500b3a2cc3249f6cd0b0a8407 100644
--- a/content/browser/renderer_host/offscreen_canvas_compositor_frame_sink_provider_impl.h
+++ b/content/browser/renderer_host/offscreen_canvas_compositor_frame_sink_provider_impl.h
@@ -5,17 +5,22 @@
 #ifndef CONTENT_BROWSER_RENDERER_HOST_OFFSCREEN_CANVAS_COMPOSITOR_FRAME_SINK_PROVIDER_IMPL_H_
 #define CONTENT_BROWSER_RENDERER_HOST_OFFSCREEN_CANVAS_COMPOSITOR_FRAME_SINK_PROVIDER_IMPL_H_
 
+#include <unordered_map>
+
+#include "content/browser/renderer_host/offscreen_canvas_compositor_frame_sink.h"
+#include "mojo/public/cpp/bindings/binding_set.h"
 #include "third_party/WebKit/public/platform/modules/offscreencanvas/offscreen_canvas_surface.mojom.h"
 
 namespace content {
 
+// TODO(fsamuel): This should be replaced with the DisplayCompositor interface.
 class OffscreenCanvasCompositorFrameSinkProviderImpl
     : public blink::mojom::OffscreenCanvasCompositorFrameSinkProvider {
  public:
   OffscreenCanvasCompositorFrameSinkProviderImpl();
   ~OffscreenCanvasCompositorFrameSinkProviderImpl() override;
 
-  static void Create(
+  void Add(
       blink::mojom::OffscreenCanvasCompositorFrameSinkProviderRequest request);
 
   // blink::mojom::OffscreenCanvasCompositorFrameSinkProvider implementation.
@@ -24,7 +29,20 @@ class OffscreenCanvasCompositorFrameSinkProviderImpl
       cc::mojom::MojoCompositorFrameSinkClientPtr client,
       cc::mojom::MojoCompositorFrameSinkRequest request) override;
 
+  cc::SurfaceManager* GetSurfaceManager();
+
+  void OnCompositorFrameSinkClientConnectionLost(
+      const cc::FrameSinkId& frame_sink_id);
+
  private:
+  std::unordered_map<cc::FrameSinkId,
+                     std::unique_ptr<OffscreenCanvasCompositorFrameSink>,
+                     cc::FrameSinkIdHash>
+      compositor_frame_sinks_;
+
+  mojo::BindingSet<blink::mojom::OffscreenCanvasCompositorFrameSinkProvider>
+      bindings_;
+
   DISALLOW_COPY_AND_ASSIGN(OffscreenCanvasCompositorFrameSinkProviderImpl);
 };