Bug 1382644 - Remove assert in CompositorManagerChild::Init for false positives. r=me
authorAndrew Osmond <aosmond@mozilla.com>
Thu, 20 Jul 2017 09:03:28 -0400
changeset 369877 e4e7f0468271b6bdc8c703d1d52c9de6e2325be3
parent 369876 1440d943e924df9a132d1d1e73974cc9bfc8695f
child 369878 05e705204d3bced8e56631b0ef6fe2abe65710c7
push id92766
push useraosmond@gmail.com
push dateThu, 20 Jul 2017 13:03:52 +0000
treeherdermozilla-inbound@e4e7f0468271 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1382644
milestone56.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 1382644 - Remove assert in CompositorManagerChild::Init for false positives. r=me CompositorManagerChild::mCanSend is cleared in ActorDestroy but that often comes in too late and after ContentChild::RecvReinitRendering which reinitializes the singleton. For now, just remove the assert so that we no longer trigger false positives in the content process after the GPU process crashes.
gfx/layers/ipc/CompositorManagerChild.cpp
--- a/gfx/layers/ipc/CompositorManagerChild.cpp
+++ b/gfx/layers/ipc/CompositorManagerChild.cpp
@@ -42,17 +42,16 @@ CompositorManagerChild::InitSameProcess(
 
 /* static */ bool
 CompositorManagerChild::Init(Endpoint<PCompositorManagerChild>&& aEndpoint,
                              uint32_t aNamespace)
 {
   MOZ_ASSERT(NS_IsMainThread());
   if (sInstance) {
     MOZ_ASSERT(sInstance->mNamespace != aNamespace);
-    MOZ_RELEASE_ASSERT(!sInstance->CanSend());
   }
 
   sInstance = new CompositorManagerChild(Move(aEndpoint), aNamespace);
   return sInstance->CanSend();
 }
 
 /* static */ void
 CompositorManagerChild::Shutdown()