Bug 1498012 Part 2 - Tolerate time warp targets being created when handling debugger requests, r=mccr8.
authorBrian Hackett <bhackett1024@gmail.com>
Wed, 17 Oct 2018 09:33:00 -0600
changeset 500489 40a4e0406d3daf01b3e2d37767cd7adce5e11396
parent 500488 8ac95e8585068592fbd91d32a3bc1460406bece9
child 500490 42143e96a1ea13f9b5adaf0ae4e9b8f3c9cdb200
push id1864
push userffxbld-merge
push dateMon, 03 Dec 2018 15:51:40 +0000
treeherdermozilla-release@f040763d99ad [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmccr8
bugs1498012
milestone64.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 1498012 Part 2 - Tolerate time warp targets being created when handling debugger requests, r=mccr8.
toolkit/recordreplay/ipc/ChildNavigation.cpp
--- a/toolkit/recordreplay/ipc/ChildNavigation.cpp
+++ b/toolkit/recordreplay/ipc/ChildNavigation.cpp
@@ -1185,19 +1185,23 @@ PositionHit(const BreakpointPosition& po
   gNavigation->PositionHit(CurrentExecutionPoint(position));
 }
 
 extern "C" {
 
 MOZ_EXPORT ProgressCounter
 RecordReplayInterface_NewTimeWarpTarget()
 {
+  if (AreThreadEventsDisallowed()) {
+    return 0;
+  }
+
   // NewTimeWarpTarget() must be called at consistent points between recording
   // and replaying.
-  recordreplay::RecordReplayAssert("NewTimeWarpTarget");
+  RecordReplayAssert("NewTimeWarpTarget");
 
   if (!gNavigation) {
     return 0;
   }
 
   // Advance the progress counter for each time warp target. This can be called
   // at any place and any number of times where recorded events are allowed.
   ProgressCounter progress = ++gProgressCounter;