commit 6a2c0a87208cdc837f960c96a9c188dfdfa9ee34
author Sunny Sachanandani <sunnyps@chromium.org> Fri Dec 14 00:08:01 2018
committer Commit Bot <commit-bot@chromium.org> Fri Dec 14 00:08:01 2018
tree f5569e2db0d8ee7d0b3a1bf6f61eca4a84767723
parent 248d648ee3b74db19f2a5f8b5eb77b589177b4e4

Enqueue destroy shared image message under lock

Fix a potential bug where last_flush_id_ could be set out of order if
two threads call DestroySharedImage.

R=ericrk@chromium.org
TBR=piman@chromium.org

Bug: 870116, 914976, 882591
Change-Id: I974bff506211cafdc49440306203d6523cf614e5
Reviewed-on: https://chromium-review.googlesource.com/c/1376852
Reviewed-by: Eric Karl <ericrk@chromium.org>
Commit-Queue: Sunny Sachanandani <sunnyps@chromium.org>
Cr-Commit-Position: refs/heads/master@{#616512}

gpu/ipc/client/shared_image_interface_proxy.cc

diff --git a/gpu/ipc/client/shared_image_interface_proxy.cc b/gpu/ipc/client/shared_image_interface_proxy.cc
index 5b4ceff..dc5247a 100644
--- a/gpu/ipc/client/shared_image_interface_proxy.cc
+++ b/gpu/ipc/client/shared_image_interface_proxy.cc
@@ -201,12 +201,11 @@
       new_token.SetVerifyFlush();
     }
   }
-  uint32_t flush_id = host_->EnqueueDeferredMessage(
-      GpuChannelMsg_DestroySharedImage(route_id_, mailbox),
-      std::move(dependencies));
   {
     base::AutoLock lock(lock_);
-    last_flush_id_ = flush_id;
+    last_flush_id_ = host_->EnqueueDeferredMessage(
+        GpuChannelMsg_DestroySharedImage(route_id_, mailbox),
+        std::move(dependencies));
   }
 }