Bug 1497393 - replace onPauseChange with native threadClient event.

Differential Revision: https://phabricator.services.mozilla.com/D26831

--HG--
extra : moz-landing-system : lando

Author: Jason Laster

devtools/client/debugger/src/actions/pause/paused.js

@@ -35,8 +35,6 @@ export function paused(pauseInfo: Pause) {
     const { thread, frames, why, loadedObjects } = pauseInfo;
     const topFrame = frames.length > 0 ? frames[0] : null;
 
-    client.onPauseChange(thread, true);
-
     dispatch({
       type: "PAUSED",
       thread,

devtools/client/debugger/src/actions/pause/resumed.js

@@ -24,8 +24,6 @@ export function resumed(packet: ResumedPacket) {
     const wasPausedInEval = inDebuggerEval(why);
     const wasStepping = isStepping(getState(), thread);
 
-    client.onPauseChange(thread, false);
-
     dispatch({ type: "RESUME", thread, wasStepping });
 
     const cx = getThreadContext(getState());

devtools/client/debugger/src/actions/pause/tests/pause.spec.js

@@ -70,8 +70,7 @@ const mockThreadClient = {
       }
     });
   },
-  getBreakpointPositions: async () => ({}),
-  onPauseChange() {}
+  getBreakpointPositions: async () => ({})
 };
 
 const mockFrameId = "1";

devtools/client/debugger/src/actions/tests/ast.spec.js

@@ -35,8 +35,7 @@ const threadClient = {
   evaluate: async expression => ({ result: evaluationResult[expression] }),
   evaluateExpressions: async expressions =>
     expressions.map(expression => ({ result: evaluationResult[expression] })),
-  getBreakpointPositions: async () => ({}),
-  onPauseChange() {}
+  getBreakpointPositions: async () => ({})
 };
 
 const sourceMaps = {

devtools/client/debugger/src/actions/tests/expressions.spec.js

@@ -46,8 +46,7 @@ const mockThreadClient = {
         matchProp: "to"
       });
     });
-  },
-  onPauseChange() {}
+  }
 };
 
 describe("expressions", () => {

devtools/client/debugger/src/actions/tests/helpers/threadClient.js

@@ -78,6 +78,5 @@ export const sourceThreadClient = {
   threadClient: async () => {},
   getFrameScopes: async () => {},
   evaluateExpressions: async () => {},
-  getBreakpointPositions: async () => ({}),
-  onPauseChange() {}
+  getBreakpointPositions: async () => ({})
 };

devtools/client/debugger/src/client/firefox/commands.js

@@ -303,10 +303,6 @@ function reload(): Promise<*> {
   return tabTarget.reload();
 }
 
-function onPauseChange(thread: string, paused: boolean) {
-  tabTarget.emit("pause-change", { thread, paused });
-}
-
 function getProperties(thread: string, grip: Grip): Promise<*> {
   const objClient = lookupThreadClient(thread).pauseGrip(grip);
 
@@ -508,7 +504,6 @@ const clientCommands = {
   evaluateExpressions,
   navigate,
   reload,
-  onPauseChange,
   getProperties,
   getFrameScopes,
   pauseOnExceptions,

devtools/client/inspector/inspector.js

@@ -135,6 +135,7 @@ function Inspector(toolbox) {
   this.onSidebarSelect = this.onSidebarSelect.bind(this);
   this.onSidebarShown = this.onSidebarShown.bind(this);
   this.onSidebarToggle = this.onSidebarToggle.bind(this);
+  this.handleThreadState = this.handleThreadState.bind(this);
 
   this._target.on("will-navigate", this._onBeforeNavigate);
 }
@@ -155,8 +156,8 @@ Inspector.prototype = {
       }
       this._replayResumed = !dbg.isPaused();
 
-      this._onReplayPauseChange = this._onReplayPauseChange.bind(this);
-      this._target.on("pause-change", this._onReplayPauseChange);
+      this._target.threadClient.addListener("paused", this.handleThreadState);
+      this._target.threadClient.addListener("resumed", this.handleThreadState);
     }
 
     await Promise.all([
@@ -1124,9 +1125,8 @@ Inspector.prototype = {
   /**
    * When replaying, reset the inspector whenever the target paused or unpauses.
    */
-  _onReplayPauseChange({ paused }) {
-    this._replayResumed = !paused;
-
+  handleThreadState(event) {
+    this._replayResumed = event != "paused";
     this.onNewRoot();
   },