gpu: guarantee to match pending GBM buffer request to actual GBM handle

content/browser/gpu/gpu_process_host.h

Index: content/browser/gpu/gpu_process_host.h
diff --git a/content/browser/gpu/gpu_process_host.h b/content/browser/gpu/gpu_process_host.h
index bd98b70c0212e387873314d736f00e191ea89f33..4622fc04a0df0bfb6788c96a77d8e0b72a2ab236 100644
--- a/content/browser/gpu/gpu_process_host.h
+++ b/content/browser/gpu/gpu_process_host.h
@@ -231,7 +231,8 @@ class GpuProcessHost : public BrowserChildProcessHostDelegate,
   std::queue<EstablishChannelCallback> channel_requests_;
 
   // The pending create gpu memory buffer requests we need to reply to.
-  std::queue<CreateGpuMemoryBufferCallback> create_gpu_memory_buffer_requests_;
+  std::map<gfx::GpuMemoryBufferId, CreateGpuMemoryBufferCallback>

[piman, 2017/05/11 18:04:43]

nit: use base::flat_map since this likely has only few entries

[dshwang, 2017/05/11 20:29:59]

Done.

+      create_gpu_memory_buffer_requests_;
 
   // A callback to signal the completion of a SendDestroyingVideoSurface call.
   base::Closure send_destroying_video_surface_done_cb_;