cc: Stop calling DetachFromClient if bind failed.

cc/surfaces/direct_compositor_frame_sink.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/direct_compositor_frame_sink.h"
 
 #include "base/bind.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_sink_client.h"
 #include "cc/surfaces/display.h"
@@ skipping 33 matching lines @@
       frame_sink_id_(frame_sink_id),
       surface_manager_(surface_manager),
       display_(display),
       factory_(frame_sink_id_, surface_manager, this) {
   DCHECK(thread_checker_.CalledOnValidThread());
   capabilities_.can_force_reclaim_resources = true;
 }
 
 DirectCompositorFrameSink::~DirectCompositorFrameSink() {
   DCHECK(thread_checker_.CalledOnValidThread());
-  if (HasClient())
-    DetachFromClient();
 }
 
 bool DirectCompositorFrameSink::BindToClient(
     CompositorFrameSinkClient* client) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
-  surface_manager_->RegisterSurfaceFactoryClient(frame_sink_id_, this);
-
   if (!CompositorFrameSink::BindToClient(client))
     return false;
 
+  surface_manager_->RegisterSurfaceFactoryClient(frame_sink_id_, this);
+
   // We want the Display's output surface to hear about lost context, and since
   // this shares a context with it, we should not be listening for lost context
   // callbacks on the context here.
-  if (context_provider())
-    context_provider()->SetLostContextCallback(base::Closure());
+  if (auto* cp = context_provider())
+    cp->SetLostContextCallback(base::Closure());
 
   // Avoid initializing GL context here, as this should be sharing the
   // Display's context.
   display_->Initialize(this, surface_manager_, frame_sink_id_);
   return true;
 }
 
 void DirectCompositorFrameSink::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.
   surface_manager_->UnregisterSurfaceFactoryClient(frame_sink_id_);
   if (!delegated_local_frame_id_.is_null())
     factory_.Destroy(delegated_local_frame_id_);
 
   CompositorFrameSink::DetachFromClient();
 }
 
 void DirectCompositorFrameSink::SwapBuffers(CompositorFrame frame) {
@@ skipping 50 matching lines @@
   // This notification is not relevant to our client outside of tests. We
   // unblock the client from DidDrawCallback() when the surface is going to
   // be drawn.
 }
 
 void DirectCompositorFrameSink::DidDrawCallback() {
   client_->DidSwapBuffersComplete();
 }
 
 }  // namespace cc