cc: Stop calling DetachFromClient if bind failed.

cc/output/compositor_frame_sink.cc

 // Copyright (c) 2013 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/output/compositor_frame_sink.h"
 
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 16 matching lines @@
 }
 
 CompositorFrameSink::CompositorFrameSink(
     scoped_refptr<VulkanContextProvider> vulkan_context_provider)
     : vulkan_context_provider_(vulkan_context_provider) {
   client_thread_checker_.DetachFromThread();
 }
 
 CompositorFrameSink::~CompositorFrameSink() {
   if (client_)
-    DetachFromClientInternal();
+    DetachFromClient();
 }
 
 bool CompositorFrameSink::BindToClient(CompositorFrameSinkClient* client) {
   DCHECK(client_thread_checker_.CalledOnValidThread());
   DCHECK(client);
   DCHECK(!client_);
   client_ = client;
   bool success = true;
 
   if (context_provider_.get()) {
     success = context_provider_->BindToCurrentThread();
     if (success) {
       context_provider_->SetLostContextCallback(
           base::Bind(&CompositorFrameSink::DidLoseCompositorFrameSink,
                      base::Unretained(this)));
     }
   }
 
-  if (!success)
-    DetachFromClient();
+  if (!success) {
+    // Destroy the ContextProvider on the thread attempted to be bound.
+    context_provider_ = nullptr;
+    client_ = nullptr;
+  }
+
   return success;
 }
 
 void CompositorFrameSink::DetachFromClient() {
-  DetachFromClientInternal();
-}
-
-// We don't post tasks bound to the client directly since they might run
-// after the CompositorFrameSink has been destroyed.
-void CompositorFrameSink::OnSwapBuffersComplete() {
-  client_->DidSwapBuffersComplete();
-}
-
-void CompositorFrameSink::DetachFromClientInternal() {
   DCHECK(client_thread_checker_.CalledOnValidThread());
   DCHECK(client_);
 
   if (context_provider_.get()) {
     context_provider_->SetLostContextCallback(
         ContextProvider::LostContextCallback());
   }
+  // Destroy the ContextProvider on the bound thread.
   context_provider_ = nullptr;
   client_ = nullptr;
 }
 
+// We don't post tasks bound to the client directly since they might run
+// after the CompositorFrameSink has been destroyed.
+void CompositorFrameSink::OnSwapBuffersComplete() {
+  client_->DidSwapBuffersComplete();
+}
+
 void CompositorFrameSink::DidLoseCompositorFrameSink() {
   TRACE_EVENT0("cc", "CompositorFrameSink::DidLoseCompositorFrameSink");
   client_->DidLoseCompositorFrameSink();
 }
 
 }  // namespace cc