Bug 1500690 - Relax compositor thread ID assertion, r=nical.
authorBrian Hackett <bhackett1024@gmail.com>
Sat, 20 Oct 2018 09:23:36 -0600
changeset 491284 5a812d8c724e4d85f5deec93b0f1972efb325f03
parent 491283 16d26c24fa86c7f5c4e6f2634ace2b06181fd294
child 491285 101430a1be58500a099200dcc097ca95bbfa1bf8
push id247
push userfmarier@mozilla.com
push dateSat, 27 Oct 2018 01:06:44 +0000
reviewersnical
bugs1500690
milestone65.0a1
Bug 1500690 - Relax compositor thread ID assertion, r=nical.
toolkit/recordreplay/ipc/ChildIPC.cpp
--- a/toolkit/recordreplay/ipc/ChildIPC.cpp
+++ b/toolkit/recordreplay/ipc/ChildIPC.cpp
@@ -540,17 +540,17 @@ PaintFromMainThread()
     gChannel->SendMessage(PaintMessage(navigation::LastNormalCheckpoint(),
                                        gPaintWidth, gPaintHeight));
   }
 }
 
 void
 NotifyPaintComplete()
 {
-  MOZ_RELEASE_ASSERT(Thread::Current()->Id() == gCompositorThreadId);
+  MOZ_RELEASE_ASSERT(!gCompositorThreadId || Thread::Current()->Id() == gCompositorThreadId);
 
   // Notify the main thread in case it is waiting for this paint to complete.
   {
     MonitorAutoLock lock(*gMonitor);
     if (--gNumPendingPaints == 0) {
       gMonitor->Notify();
     }
   }