Bug 1500690 - Relax compositor thread ID assertion, r=nical.
authorBrian Hackett <bhackett1024@gmail.com>
Sat, 20 Oct 2018 09:23:36 -0600
changeset 443013 5a812d8c724e4d85f5deec93b0f1972efb325f03
parent 443012 16d26c24fa86c7f5c4e6f2634ace2b06181fd294
child 443014 101430a1be58500a099200dcc097ca95bbfa1bf8
push id34934
push userccoroiu@mozilla.com
push dateThu, 25 Oct 2018 21:57:20 +0000
treeherdermozilla-central@1e44ac3b69a4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnical
bugs1500690
milestone65.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 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();
     }
   }