Detach the output surface if bind fails.

content/renderer/gpu/compositor_output_surface.cc

 // Copyright (c) 2012 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/renderer/gpu/compositor_output_surface.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/location.h"
@@ skipping 63 matching lines @@
     client->SetMemoryPolicy(cc::ManagedMemoryPolicy(
         128 * 1024 * 1024,
         gpu::MemoryAllocation::CUTOFF_ALLOW_NICE_TO_HAVE,
         base::SharedMemory::GetHandleLimit() / 3));
   }
 
   return true;
 }
 
 void CompositorOutputSurface::DetachFromClient() {
-  if (!HasClient())

[enne (OOO), 2016/05/06 19:43:30]

I don't understand the changes here in this function, both this and the
conditional for remove handler.  Does this not get called twice anymore and
you're counting on the DCHECK in the base class to catch that?

[danakj, 2016/05/06 20:15:27]

This calls cc::OutputSurface::DetachFromClient which DCHECKs that client_ is
null. There's nothing special about use of this implementation that would call
this twice here but not on other output surface impls, and others do not do this
early out. I ended up not needing it to make this patch work, cuz I'm doing the
detach from inside the base class, so I could undo this change tho.

-    return;
-  if (output_surface_proxy_.get())
+  if (output_surface_proxy_) {
     output_surface_proxy_->ClearOutputSurface();
-  output_surface_filter_->RemoveHandlerOnCompositorThread(

[danakj, 2016/05/06 20:15:27]

Moving this inside the if is needed because we can be halfway bound. There's a
client and all, but our own BindToClient method early outted so we didn't make
our filter_handler_ yet. We did if we made a proxy though.

-      routing_id_, output_surface_filter_handler_);
+    output_surface_filter_->RemoveHandlerOnCompositorThread(
+        routing_id_, output_surface_filter_handler_);
+  }
   cc::OutputSurface::DetachFromClient();
 }
 
 void CompositorOutputSurface::ShortcutSwapAck(
     uint32_t output_surface_id,
     std::unique_ptr<cc::GLFrameData> gl_frame_data) {
   if (!layout_test_previous_frame_ack_) {
     layout_test_previous_frame_ack_.reset(new cc::CompositorFrameAck);
     layout_test_previous_frame_ack_->gl_frame_data.reset(new cc::GLFrameData);
   }
@@ skipping 97 matching lines @@
   if (output_surface_id != output_surface_id_)
     return;
   ReclaimResources(&ack);
 }
 
 bool CompositorOutputSurface::Send(IPC::Message* message) {
   return message_sender_->Send(message);
 }
 
 }  // namespace content