Bug 1354198 - Fix WebRenderBridgeParent::RecvShutdown() r=nical
authorsotaro <sotaro.ikeda.g@gmail.com>
Thu, 18 May 2017 09:31:46 +0900
changeset 407444 04109e4818e5af8e8f893dacdfb09850bc9425c9
parent 407443 44fbf318477a0e67a6e4ab08e488248df330b795
child 407445 48d70f0d29ff6929901baf96f1c9c7f46370e1b9
push id7391
push usermtabara@mozilla.com
push dateMon, 12 Jun 2017 13:08:53 +0000
treeherdermozilla-beta@2191d7f87e2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnical
bugs1354198
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1354198 - Fix WebRenderBridgeParent::RecvShutdown() r=nical
gfx/layers/wr/WebRenderBridgeParent.cpp
--- a/gfx/layers/wr/WebRenderBridgeParent.cpp
+++ b/gfx/layers/wr/WebRenderBridgeParent.cpp
@@ -152,22 +152,20 @@ WebRenderBridgeParent::RecvCreate(const 
 #endif
 
   return IPC_OK();
 }
 
 mozilla::ipc::IPCResult
 WebRenderBridgeParent::RecvShutdown()
 {
-  if (mDestroyed) {
-    return IPC_OK();
-  }
   Destroy();
+  IProtocol* mgr = Manager();
   if (!Send__delete__(this)) {
-    return IPC_FAIL_NO_REASON(this);
+    return IPC_FAIL_NO_REASON(mgr);
   }
   return IPC_OK();
 }
 
 void
 WebRenderBridgeParent::Destroy()
 {
   if (mDestroyed) {