Only call LayerTransactionChild::Destroy on the main thread. (bug 132…

…8633, r=mattwoodrow)
dothq · Feb 8, 2017 · cd897b6 · cd897b6
1 parent ea0cbd8
commit cd897b6
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/gfx/layers/ipc/ShadowLayers.cpp b/gfx/layers/ipc/ShadowLayers.cpp
@@ -213,8 +213,14 @@ ShadowLayerForwarder::~ShadowLayerForwarder()
   delete mTxn;
   if (mShadowManager) {
     mShadowManager->SetForwarder(nullptr);
-    mShadowManager->Destroy();
+    if (NS_IsMainThread()) {
+      mShadowManager->Destroy();
+    } else {
+      NS_DispatchToMainThread(
+        NewRunnableMethod(mShadowManager, &LayerTransactionChild::Destroy));
+    }
   }
+
   if (!NS_IsMainThread()) {
     NS_DispatchToMainThread(
       new ReleaseOnMainThreadTask<ActiveResourceTracker>(mActiveResourceTracker));