Mac: Don't hang gpu process on popup close under certain conditions

chrome/gpu/gpu_thread.cc

 // Copyright (c) 2010 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 "chrome/gpu/gpu_thread.h"
 
 #include <string>
 #include <vector>
 
 #include "app/gfx/gl/gl_context.h"
@@ skipping 37 matching lines @@
   gpu_info_.SetInitializationTime(base::Time::Now() - process_start_time);
 }
 
 void GpuThread::RemoveChannel(int renderer_id) {
   gpu_channels_.erase(renderer_id);
 }
 
 void GpuThread::OnControlMessageReceived(const IPC::Message& msg) {
   bool msg_is_ok = true;
   IPC_BEGIN_MESSAGE_MAP_EX(GpuThread, msg, msg_is_ok)
-    IPC_MESSAGE_HANDLER(GpuMsg_EstablishChannel,
-                        OnEstablishChannel)
-    IPC_MESSAGE_HANDLER(GpuMsg_CloseChannel,
-                        OnCloseChannel)
-    IPC_MESSAGE_HANDLER(GpuMsg_Synchronize,
-                        OnSynchronize)
-    IPC_MESSAGE_HANDLER(GpuMsg_CollectGraphicsInfo,
-                        OnCollectGraphicsInfo)
+    IPC_MESSAGE_HANDLER(GpuMsg_EstablishChannel, OnEstablishChannel)
+    IPC_MESSAGE_HANDLER(GpuMsg_CloseChannel, OnCloseChannel)
+    IPC_MESSAGE_HANDLER(GpuMsg_Synchronize, OnSynchronize)
+    IPC_MESSAGE_HANDLER(GpuMsg_CollectGraphicsInfo, OnCollectGraphicsInfo)
 #if defined(OS_MACOSX)
     IPC_MESSAGE_HANDLER(GpuMsg_AcceleratedSurfaceBuffersSwappedACK,
                         OnAcceleratedSurfaceBuffersSwappedACK)
+    IPC_MESSAGE_HANDLER(GpuMsg_DidDestroySurface, OnDidDestroySurface)
 #endif
-    IPC_MESSAGE_HANDLER(GpuMsg_Crash,
-                        OnCrash)
-    IPC_MESSAGE_HANDLER(GpuMsg_Hang,
-                        OnHang)
+    IPC_MESSAGE_HANDLER(GpuMsg_Crash, OnCrash)
+    IPC_MESSAGE_HANDLER(GpuMsg_Hang, OnHang)
   IPC_END_MESSAGE_MAP_EX()
 }
 
 void GpuThread::OnEstablishChannel(int renderer_id) {
   scoped_refptr<GpuChannel> channel;
   IPC::ChannelHandle channel_handle;
   GPUInfo gpu_info;
 
   GpuChannelMap::const_iterator iter = gpu_channels_.find(renderer_id);
   if (iter == gpu_channels_.end())
@@ skipping 41 matching lines @@
 
 #if defined(OS_MACOSX)
 void GpuThread::OnAcceleratedSurfaceBuffersSwappedACK(
     int renderer_id, int32 route_id, uint64 swap_buffers_count) {
   GpuChannelMap::const_iterator iter = gpu_channels_.find(renderer_id);
   if (iter == gpu_channels_.end())
     return;
   scoped_refptr<GpuChannel> channel = iter->second;
   channel->AcceleratedSurfaceBuffersSwapped(route_id, swap_buffers_count);
 }
+void GpuThread::OnDidDestroySurface(int renderer_id, int32 renderer_route_id) {
+  GpuChannelMap::const_iterator iter = gpu_channels_.find(renderer_id);
+  if (iter == gpu_channels_.end())
+    return;
+  scoped_refptr<GpuChannel> channel = iter->second;
+  channel->DidDestroySurface(renderer_route_id);
+}
 #endif
 
 void GpuThread::OnCrash() {
   // Good bye, cruel world.
   volatile int* it_s_the_end_of_the_world_as_we_know_it = NULL;
   *it_s_the_end_of_the_world_as_we_know_it = 0xdead;
 }
 
 void GpuThread::OnHang() {
   for (;;) {
@@ skipping 17 matching lines @@
       NewRunnableFunction(&GpuThread::SetDxDiagnostics, thread, node));
 }
 
 // Runs on the GPU thread.
 void GpuThread::SetDxDiagnostics(GpuThread* thread, const DxDiagNode& node) {
   thread->gpu_info_.SetDxDiagnostics(node);
   thread->gpu_info_.SetProgress(GPUInfo::kComplete);
 }
 
 #endif