Fix surface crash.

services/surfaces/surfaces_impl.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 "services/surfaces/surfaces_impl.h"
 
 #include "base/trace_event/trace_event.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/resources/returned_resource.h"
 #include "cc/surfaces/display.h"
@@ skipping 52 matching lines @@
                                const mojo::Closure& callback) {
   TRACE_EVENT0("mojo", "SurfacesImpl::SubmitFrame");
   factory_.SubmitFrame(QualifyIdentifier(local_id),
                        frame.To<scoped_ptr<cc::CompositorFrame>>(),
                        base::Bind(&CallCallback, callback));
   client_->FrameSubmitted();
 }
 
 void SurfacesImpl::DestroySurface(uint32_t local_id) {
   factory_.Destroy(QualifyIdentifier(local_id));
+  if (local_id == displayed_surface_) {
+    displayed_surface_ = 0;
+    client_->OnDisplayBeingDestroyed(display_.get());
+    display_.reset();
+  }
 }
 
 void SurfacesImpl::CreateGLES2BoundSurface(
     mojo::CommandBufferPtr gles2_client,
     uint32_t local_id,
     mojo::SizePtr size,
     mojo::InterfaceRequest<mojo::ViewportParameterListener> listener_request) {
   command_buffer_handle_ = gles2_client.PassMessagePipe();
 
   if (!display_) {
     cc::RendererSettings settings;
     display_.reset(new cc::Display(this, manager_, nullptr, nullptr, settings));
     client_->SetDisplay(display_.get());
     display_->Initialize(make_scoped_ptr(new mojo::DirectOutputSurface(
         new mojo::ContextProviderMojo(command_buffer_handle_.Pass()))));
   }
+  displayed_surface_ = local_id;
   cc::SurfaceId cc_id = QualifyIdentifier(local_id);
   factory_.Create(cc_id);
   display_->SetSurfaceId(cc_id, 1.f);
   display_->Resize(size.To<gfx::Size>());
   parameter_listeners_.AddBinding(this, listener_request.Pass());
 }
 
 void SurfacesImpl::ReturnResources(const cc::ReturnedResourceArray& resources) {
   if (resources.empty() || !returner_)
     return;
@@ skipping 30 matching lines @@
       base::TimeDelta::FromInternalValue(interval));
 }
 
 SurfacesImpl::SurfacesImpl(cc::SurfaceManager* manager,
                            uint32_t id_namespace,
                            Client* client)
     : manager_(manager),
       factory_(manager, this),
       id_namespace_(id_namespace),
       client_(client),
+      displayed_surface_(0),
       binding_(this) {
 }
 
 cc::SurfaceId SurfacesImpl::QualifyIdentifier(uint32_t local_id) {
   return cc::SurfaceId(static_cast<uint64_t>(id_namespace_) << 32 | local_id);
 }
 
 }  // namespace mojo