Detach the output surface if bind fails.

content/renderer/gpu/compositor_output_surface.cc

Index: content/renderer/gpu/compositor_output_surface.cc
diff --git a/content/renderer/gpu/compositor_output_surface.cc b/content/renderer/gpu/compositor_output_surface.cc
index ae3f5142ba87611dcc38c75631888ca805005af1..d48caa90befc3eda76f4b611c5106bec69f70c83 100644
--- a/content/renderer/gpu/compositor_output_surface.cc
+++ b/content/renderer/gpu/compositor_output_surface.cc
@@ -81,12 +81,11 @@ bool CompositorOutputSurface::BindToClient(
 }
 
 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();
 }