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

chrome/gpu/gpu_channel.h

Index: chrome/gpu/gpu_channel.h
diff --git a/chrome/gpu/gpu_channel.h b/chrome/gpu/gpu_channel.h
index 53c0d7029e3ee0df1a2375177fb59eca8b5e7e3b..e449dc4b5d152130d0fa0b176ec9b00d15805a9d 100644
--- a/chrome/gpu/gpu_channel.h
+++ b/chrome/gpu/gpu_channel.h
@@ -6,6 +6,7 @@
 #define CHROME_GPU_GPU_CHANNEL_H_
 #pragma once
 
+#include <set>
 #include <string>
 #include <vector>
 
@@ -55,6 +56,9 @@ class GpuChannel : public IPC::Channel::Listener,
 #if defined(OS_MACOSX)
   virtual void AcceleratedSurfaceBuffersSwapped(
       int32 route_id, uint64 swap_buffers_count);
+  void DidDestroySurface(int32 renderer_route_id);
+
+  bool IsRenderViewGone(int32 renderer_route_id);
 #endif
 
  private:
@@ -94,7 +98,11 @@ class GpuChannel : public IPC::Channel::Listener,
 #if defined(ENABLE_GPU)
   typedef IDMap<GpuCommandBufferStub, IDMapOwnPointer> StubMap;
   StubMap stubs_;
-#endif
+
+#if defined(OS_MACOSX)
+  std::set<int32> destroyed_renderer_routes_;
+#endif  // defined (OS_MACOSX)
+#endif  // defined (ENABLE_GPU)
 
   bool log_messages_;  // True if we should log sent and received messages.