Backed out changeset 238d9fba1b5a (bug 1533160) for Debugger failures
authorDorel Luca <dluca@mozilla.com>
Thu, 07 Mar 2019 05:56:24 +0200
changeset 520696 395886e7b66bffae4928f3a5e92945b77dc3b3a0
parent 520695 afb2e1e1665f03d83fd217cd953b4759ca3747cb
child 520697 281171d69172b03ff560d9a1702aeac9c5f35c66
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1533160
milestone67.0a1
backs out238d9fba1b5a62117ddf96bfb020c0743c877ba7
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
Backed out changeset 238d9fba1b5a (bug 1533160) for Debugger failures
devtools/client/debugger/new/src/client/firefox/commands.js
devtools/client/debugger/new/src/utils/dbg.js
devtools/server/actors/thread.js
devtools/server/actors/utils/breakpoint-actor-map.js
--- a/devtools/client/debugger/new/src/client/firefox/commands.js
+++ b/devtools/client/debugger/new/src/client/firefox/commands.js
@@ -67,18 +67,18 @@ function createObjectClient(grip: Grip) 
 function releaseActor(actor: String) {
   if (!actor) {
     return;
   }
 
   return debuggerClient.release(actor);
 }
 
-function sendPacket(packet: Object) {
-  return debuggerClient.request(packet)
+function sendPacket(packet: Object, callback?: Function = r => r) {
+  return debuggerClient.request(packet).then(callback);
 }
 
 function lookupThreadClient(thread: string) {
   if (thread == threadClient.actor) {
     return threadClient;
   }
   if (!workerClients[thread]) {
     throw new Error(`Unknown thread client: ${thread}`);
--- a/devtools/client/debugger/new/src/utils/dbg.js
+++ b/devtools/client/debugger/new/src/utils/dbg.js
@@ -13,29 +13,30 @@ function findSource(dbg: any, url: strin
   return sources.find(s => (s.url || "").includes(url));
 }
 
 function findSources(dbg: any, url: string) {
   const sources = dbg.selectors.getSourceList();
   return sources.filter(s => (s.url || "").includes(url));
 }
 
-function sendPacket(dbg: any, packet: any) {
-  return dbg.client.sendPacket(packet);
+function sendPacket(dbg: any, packet: any, callback: () => void) {
+  dbg.client.sendPacket(packet, callback || console.log);
 }
 
-function sendPacketToThread(dbg: Object, packet: any) {
-  return sendPacket(
+function sendPacketToThread(dbg: Object, packet: any, callback: Function = () => {}) {
+  sendPacket(
     dbg,
-    { to: dbg.connection.tabConnection.threadClient.actor, ...packet }
+    { to: dbg.connection.tabConnection.threadClient.actor, ...packet },
+    callback
   );
 }
 
-function evaluate(dbg: Object, expression: any) {
-  return dbg.client.evaluate(expression)
+function evaluate(dbg: Object, expression: any, callback: () => void) {
+  dbg.client.evaluate(expression).then(callback || console.log);
 }
 
 function bindSelectors(obj: Object): Object {
   return Object.keys(obj.selectors).reduce((bound, selector) => {
     bound[selector] = (a, b, c) =>
       obj.selectors[selector](obj.store.getState(), a, b, c);
     return bound;
   }, {});
--- a/devtools/server/actors/thread.js
+++ b/devtools/server/actors/thread.js
@@ -1756,17 +1756,16 @@ const ThreadActor = ActorClassWithSpec(t
     return true;
   },
 
   onDump: function() {
     return {
       pauseOnExceptions: this._options.pauseOnExceptions,
       ignoreCaughtExceptions: this._options.ignoreCaughtExceptions,
       skipBreakpoints: this.skipBreakpoints,
-      breakpoints: this.breakpointActorMap.listKeys(),
     };
   },
 });
 
 Object.assign(ThreadActor.prototype.requestTypes, {
   "attach": ThreadActor.prototype.onAttach,
   "detach": ThreadActor.prototype.onDetach,
   "reconfigure": ThreadActor.prototype.onReconfigure,
--- a/devtools/server/actors/utils/breakpoint-actor-map.js
+++ b/devtools/server/actors/utils/breakpoint-actor-map.js
@@ -26,20 +26,16 @@ BreakpointActorMap.prototype = {
 
   /**
    * Return all BreakpointActors in this BreakpointActorMap.
    */
   findActors() {
     return Object.values(this._actors);
   },
 
-  listKeys() {
-    return Object.keys(this._actors);
-  },
-
   /**
    * Return the BreakpointActor at the given location in this
    * BreakpointActorMap.
    *
    * @param BreakpointLocation location
    *        The location for which the BreakpointActor should be returned.
    *
    * @returns BreakpointActor actor