Hook up BeginFrameSource to SurfaceFactoryClient via SurfaceManager

cc/surfaces/surface_display_output_surface.cc

 // Copyright 2014 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 "cc/surfaces/surface_display_output_surface.h"
 
 #include "base/bind.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_ack.h"
 #include "cc/surfaces/display.h"
@@ skipping 15 matching lines @@
   factory_.set_needs_sync_points(false);
   capabilities_.delegated_rendering = true;
   capabilities_.adjust_deadline_for_parent = true;
   capabilities_.can_force_reclaim_resources = true;
   // Display and SurfaceDisplayOutputSurface share a GL context, so sync
   // points aren't needed when passing resources between them.
   capabilities_.delegated_sync_points_required = false;
 }
 
 SurfaceDisplayOutputSurface::~SurfaceDisplayOutputSurface() {
-  client_ = NULL;
+  if (HasClient())
+    DetachFromClient();
   if (!surface_id_.is_null()) {
     factory_.Destroy(surface_id_);
   }
 }
 
 void SurfaceDisplayOutputSurface::ReceivedVSyncParameters(
     base::TimeTicks timebase,
     base::TimeDelta interval) {
   CommitVSyncParameters(timebase, interval);
 }
@@ skipping 18 matching lines @@
   frame->AssignTo(frame_copy.get());
   factory_.SubmitCompositorFrame(
       surface_id_, std::move(frame_copy),
       base::Bind(&SurfaceDisplayOutputSurface::SwapBuffersComplete,
                  base::Unretained(this)));
 }
 
 bool SurfaceDisplayOutputSurface::BindToClient(OutputSurfaceClient* client) {
   DCHECK(client);
   DCHECK(display_client_);
+  factory_.manager()->RegisterSurfaceFactoryClient(allocator_->id_namespace(),
+                                                   this);
+
   client_ = client;
   // Avoid initializing GL context here, as this should be sharing the
   // Display's context.
   return display_client_->Initialize();
 }
 
 void SurfaceDisplayOutputSurface::ForceReclaimResources() {
   if (!surface_id_.is_null())
     factory_.SubmitCompositorFrame(surface_id_, nullptr,
                                    SurfaceFactory::DrawCallback());
 }
 
+void SurfaceDisplayOutputSurface::DetachFromClient() {
+  DCHECK(HasClient());
+  // Unregister the SurfaceFactoryClient here instead of the dtor so that only
+  // one client is alive for this namespace at any given time.
+  factory_.manager()->UnregisterSurfaceFactoryClient(
+      allocator_->id_namespace());
+  OutputSurface::DetachFromClient();
+  DCHECK(!HasClient());
+}
+
 void SurfaceDisplayOutputSurface::ReturnResources(
     const ReturnedResourceArray& resources) {
   CompositorFrameAck ack;
   ack.resources = resources;
   if (client_)
     client_->ReclaimResources(&ack);
 }
 
 void SurfaceDisplayOutputSurface::SetBeginFrameSource(
-    SurfaceId surface_id,
     BeginFrameSource* begin_frame_source) {
   // TODO(tansell): Hook this up.
 }
 
 void SurfaceDisplayOutputSurface::SwapBuffersComplete(SurfaceDrawStatus drawn) {
   if (client_ && !display_client_->output_surface_lost())
     client_->DidSwapBuffersComplete();
 }
 
 }  // namespace cc