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

chrome/gpu/gpu_command_buffer_stub.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.
 
 #if defined(ENABLE_GPU)
 
 #include "base/process_util.h"
 #include "base/shared_memory.h"
 #include "build/build_config.h"
 #include "chrome/common/child_thread.h"
@@ skipping 263 matching lines @@
   *state = command_buffer_->GetState();
 }
 
 void GpuCommandBufferStub::OnAsyncGetState() {
   gpu::CommandBuffer::State state = command_buffer_->GetState();
   Send(new GpuCommandBufferMsg_UpdateState(route_id_, state));
 }
 
 void GpuCommandBufferStub::OnFlush(int32 put_offset,
                                    gpu::CommandBuffer::State* state) {
+#if defined(OS_MACOSX)
+  // See comment in |DidDestroySurface()| in gpu_processor_mac.cc.
+  if (channel_->IsRenderViewGone(render_view_id_))
+    processor_->DidDestroySurface();
+#endif
   *state = command_buffer_->Flush(put_offset);
 }
 
 void GpuCommandBufferStub::OnAsyncFlush(int32 put_offset) {
   gpu::CommandBuffer::State state = command_buffer_->Flush(put_offset);
   Send(new GpuCommandBufferMsg_UpdateState(route_id_, state));
 }
 
 void GpuCommandBufferStub::OnCreateTransferBuffer(int32 size, int32* id) {
   *id = command_buffer_->CreateTransferBuffer(size);
@@ skipping 52 matching lines @@
 
 void GpuCommandBufferStub::SwapBuffersCallback() {
   OnSwapBuffers();
   ChildThread* gpu_thread = ChildThread::current();
   GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params params;
   params.renderer_id = renderer_id_;
   params.render_view_id = render_view_id_;
   params.window = handle_;
   params.surface_id = processor_->GetSurfaceId();
   params.route_id = route_id();
-#if defined(OS_MACOSX)
   params.swap_buffers_count = processor_->swap_buffers_count();
-#endif  // defined(OS_MACOSX)
   gpu_thread->Send(new GpuHostMsg_AcceleratedSurfaceBuffersSwapped(params));
 }
 
 void GpuCommandBufferStub::AcceleratedSurfaceBuffersSwapped(
     uint64 swap_buffers_count) {
   processor_->set_acknowledged_swap_buffers_count(swap_buffers_count);
   // Wake up the GpuProcessor to start doing work again.
   processor_->ScheduleProcessCommands();
 }
 #endif  // defined(OS_MACOSX)
 
 void GpuCommandBufferStub::ResizeCallback(gfx::Size size) {
   if (handle_ == gfx::kNullPluginWindow)
     return;
 
 #if defined(OS_LINUX)
   ChildThread* gpu_thread = ChildThread::current();
   bool result = false;
   gpu_thread->Send(
       new GpuHostMsg_ResizeXID(handle_, size, &result));
 #elif defined(OS_WIN)
   HWND hwnd = static_cast<HWND>(compositor_window_);
   UINT swp_flags = SWP_NOSENDCHANGING | SWP_NOOWNERZORDER | SWP_NOCOPYBITS |
     SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_DEFERERASE;
   SetWindowPos(hwnd, NULL, 0, 0, size.width(), size.height(), swp_flags);
 #endif  // defined(OS_LINUX)
 }
 
 #endif  // defined(ENABLE_GPU)