Destroy SurfaceDisplayOutputSurface's surface in its destructor

This prevents a leak and avoids hitting a DCHECK.

Review URL: https://codereview.chromium.org/400063002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283997 0039d316-1c4b-4281-b951-d872f2087c98

content/browser/compositor/surface_display_output_surface.cc

@@ -27,6 +27,10 @@ SurfaceDisplayOutputSurface::SurfaceDisplayOutputSurface(
 }
 
 SurfaceDisplayOutputSurface::~SurfaceDisplayOutputSurface() {
+  client_ = NULL;
+  if (!surface_id_.is_null()) {
+    factory_.Destroy(surface_id_);
+  }
 }
 
 void SurfaceDisplayOutputSurface::SwapBuffers(cc::CompositorFrame* frame) {
@@ -57,7 +61,8 @@ void SurfaceDisplayOutputSurface::ReturnResources(
     const cc::ReturnedResourceArray& resources) {
   cc::CompositorFrameAck ack;
   ack.resources = resources;
-  client_->ReclaimResources(&ack);
+  if (client_)
+    client_->ReclaimResources(&ack);
 }
 
 }  // namespace content