Make Mandoline shut down cleanly.

components/gles2/command_buffer_driver.cc

 // Copyright 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 "components/gles2/command_buffer_driver.h"
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/shared_memory.h"
 #include "components/gles2/command_buffer_type_conversions.h"
@@ skipping 39 matching lines @@
 CommandBufferDriver::Client::~Client() {
 }
 
 CommandBufferDriver::CommandBufferDriver(
     gfx::GLShareGroup* share_group,
     gpu::gles2::MailboxManager* mailbox_manager,
     gpu::SyncPointManager* sync_point_manager)
     : CommandBufferDriver(gfx::kNullAcceleratedWidget,
                           share_group,
                           mailbox_manager,
-                          sync_point_manager) {
+                          sync_point_manager,
+                          base::Callback<void(CommandBufferDriver*)>()) {
 }
 
 CommandBufferDriver::CommandBufferDriver(
     gfx::AcceleratedWidget widget,
     gfx::GLShareGroup* share_group,
     gpu::gles2::MailboxManager* mailbox_manager,
-    gpu::SyncPointManager* sync_point_manager)
+    gpu::SyncPointManager* sync_point_manager,
+    const base::Callback<void(CommandBufferDriver*)>& destruct_callback)
     : client_(nullptr),
       widget_(widget),
       share_group_(share_group),
       mailbox_manager_(mailbox_manager),
       sync_point_manager_(sync_point_manager),
+      destruct_callback_(destruct_callback),
       weak_factory_(this) {
 }
 
 CommandBufferDriver::~CommandBufferDriver() {
-  if (decoder_) {
-    bool have_context = decoder_->MakeCurrent();
-    decoder_->Destroy(have_context);
-  }
+  DestroyDecoder();
+  if (!destruct_callback_.is_null())
+    destruct_callback_.Run(this);
 }
 
 void CommandBufferDriver::Initialize(
     mojo::CommandBufferSyncClientPtr sync_client,
     mojo::CommandBufferLostContextObserverPtr loss_observer,
     mojo::ScopedSharedBufferHandle shared_state) {
   sync_client_ = sync_client.Pass();
   loss_observer_ = loss_observer.Pass();
   bool success = DoInitialize(shared_state.Pass());
   mojo::GpuCapabilitiesPtr capabilities =
@@ skipping 76 matching lines @@
 
   command_buffer_->SetSharedStateBuffer(backing.Pass());
   return true;
 }
 
 void CommandBufferDriver::SetGetBuffer(int32_t buffer) {
   command_buffer_->SetGetBuffer(buffer);
 }
 
 void CommandBufferDriver::Flush(int32_t put_offset) {
+  if (!context_)
+    return;
   if (!context_->MakeCurrent(surface_.get())) {
     DLOG(WARNING) << "Context lost";
     OnContextLost(gpu::error::kUnknown);
     return;
   }
   command_buffer_->Flush(put_offset);
 }
 
+void CommandBufferDriver::DestroyWindow() {
+  DestroyDecoder();
+  surface_ = nullptr;
+  context_ = nullptr;
+  destruct_callback_.Reset();
+}
+
 void CommandBufferDriver::MakeProgress(int32_t last_get_offset) {
   // TODO(piman): handle out-of-order.
   sync_client_->DidMakeProgress(
       mojo::CommandBufferState::From(command_buffer_->GetLastState()));
 }
 
 void CommandBufferDriver::RegisterTransferBuffer(
     int32_t id,
     mojo::ScopedSharedBufferHandle transfer_buffer,
     uint32_t size) {
@@ skipping 45 matching lines @@
   loss_observer_->DidLoseContext(reason);
   client_->DidLoseContext();
 }
 
 void CommandBufferDriver::OnUpdateVSyncParameters(
     const base::TimeTicks timebase,
     const base::TimeDelta interval) {
   client_->UpdateVSyncParameters(timebase, interval);
 }
 
+void CommandBufferDriver::DestroyDecoder() {
+  if (decoder_) {
+    bool have_context = decoder_->MakeCurrent();
+    decoder_->Destroy(have_context);
+    decoder_.reset();
+  }
+}
+
 }  // namespace gles2