Create manager to track OffscreenCanvasSurfaceImpl instances

content/browser/renderer_host/offscreen_canvas_compositor_frame_sink.cc

 // Copyright 2016 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 "content/browser/renderer_host/offscreen_canvas_compositor_frame_sink.h"
 
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_manager.h"
 #include "content/browser/compositor/surface_utils.h"
+#include "content/browser/renderer_host/offscreen_canvas_surface_manager.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 
 namespace content {
 
 OffscreenCanvasCompositorFrameSink::OffscreenCanvasCompositorFrameSink(
+    uint32_t canvas_id,
     const cc::SurfaceId& surface_id,
     cc::mojom::MojoCompositorFrameSinkClientPtr client)
-    : surface_id_(surface_id), client_(std::move(client)) {}
+    : canvas_id_(canvas_id),

[dcheng, 2016/11/08 18:30:23]

Please make sure that |canvas_id_| and |canvas_id| have matching types.

(Actually, I'm not sure why this class needs |canvas_id_|, it's never used after
the ctor.

[xlai (Olivia), 2016/11/10 15:45:11]

This canvas_id_ is a unique identifier for this particular instance of
OffscreenCanvasCompositorFrameSink. Both OffscreenCanvasSurfaceImpl instances
and OffscreenCanvasCompositorFrameSink instances find their counterparts via the
use of this canvas_id. Although it is not used in this patch (except the unit
test), it's going to be used in the next few patches for a OffscreenCanvas style
resizing workflow.

+      surface_id_(surface_id),
+      client_(std::move(client)),
+      weak_factory_(this) {
+  OffscreenCanvasSurfaceManager::GetInstance()
+      ->RegisterCompositorFrameSinkInstance(canvas_id_, this);
+}
 
 OffscreenCanvasCompositorFrameSink::~OffscreenCanvasCompositorFrameSink() {
   if (surface_factory_) {
     cc::SurfaceManager* manager = GetSurfaceManager();
     if (!manager) {
       // Inform SurfaceFactory that SurfaceManager's no longer alive to
       // avoid its destruction error.
       surface_factory_->DidDestroySurfaceManager();
     } else {
       manager->InvalidateFrameSinkId(surface_id_.frame_sink_id());
     }
     surface_factory_->Destroy(surface_id_.local_frame_id());
   }
 }
 
 // static
 void OffscreenCanvasCompositorFrameSink::Create(
+    uint32_t canvas_id,
     const cc::SurfaceId& surface_id,
     cc::mojom::MojoCompositorFrameSinkClientPtr client,
     cc::mojom::MojoCompositorFrameSinkRequest request) {
   mojo::MakeStrongBinding(base::MakeUnique<OffscreenCanvasCompositorFrameSink>(
-                              surface_id, std::move(client)),
+                              canvas_id, surface_id, std::move(client)),
                           std::move(request));
 }
 
 void OffscreenCanvasCompositorFrameSink::SubmitCompositorFrame(
     cc::CompositorFrame frame) {
   if (!surface_factory_) {
     cc::SurfaceManager* manager = GetSurfaceManager();
     surface_factory_ = base::MakeUnique<cc::SurfaceFactory>(
         surface_id_.frame_sink_id(), manager, this);
     surface_factory_->Create(surface_id_.local_frame_id());
@@ skipping 40 matching lines @@
   client_->DidReceiveCompositorFrameAck();
   DCHECK_GT(ack_pending_count_, 0);
   if (!surface_returned_resources_.empty()) {
     client_->ReclaimResources(surface_returned_resources_);
     surface_returned_resources_.clear();
   }
   ack_pending_count_--;
 }
 
 }  // namespace content