Backed out changeset 70d1a0c0270c (bug 832983) for devtools failures on /test/browser_inspector_pseudoclass-lock.js. CLOSED TREE

devtools/server/actors/thread.js

@@ -7,7 +7,7 @@
 "use strict";
 
 const Services = require("Services");
-const { Cr, Ci } = require("chrome");
+const { Cr } = require("chrome");
 const { ActorPool, GeneratedLocation } = require("devtools/server/actors/common");
 const { createValueGrip } = require("devtools/server/actors/object/utils");
 const { longStringGrip } = require("devtools/server/actors/object/long-string");
@@ -64,7 +64,6 @@ const ThreadActor = ActorClassWithSpec(threadSpec, {
     this._parentClosed = false;
     this._scripts = null;
     this._pauseOnDOMEvents = null;
-    this._xhrBreakpoints = [];
 
     this._options = {
       useSourceMaps: false,
@@ -93,17 +92,7 @@ const ThreadActor = ActorClassWithSpec(threadSpec, {
     this.objectGrip = this.objectGrip.bind(this);
     this.pauseObjectGrip = this.pauseObjectGrip.bind(this);
     this._onWindowReady = this._onWindowReady.bind(this);
-    this._onOpeningRequest = this._onOpeningRequest.bind(this);
     EventEmitter.on(this._parent, "window-ready", this._onWindowReady);
-
-    // Workers don't have access to `Services` and even if they did, network
-    // requests are all dispatched to the main thread, so there would be
-    // nothing here to listen for. We'll need to revisit implementing
-    // XHR breakpoints for workers.
-    if (!isWorker) {
-      Services.obs.addObserver(this._onOpeningRequest, "http-on-opening-request");
-    }
-
     // Set a wrappedJSObject property so |this| can be sent via the observer svc
     // for the xpcshell harness.
     this.wrappedJSObject = this;
@@ -239,10 +228,6 @@ const ThreadActor = ActorClassWithSpec(threadSpec, {
     // things like breakpoints across connections.
     this._sourceActorStore = null;
 
-    if (!isWorker) {
-      Services.obs.removeObserver(this._onOpeningRequest, "http-on-opening-request");
-    }
-
     EventEmitter.off(this._parent, "window-ready", this._onWindowReady);
     this.sources.off("newSource", this.onNewSourceEvent);
     this.sources.off("updatedSource", this.onUpdatedSourceEvent);
@@ -332,81 +317,6 @@ const ThreadActor = ActorClassWithSpec(threadSpec, {
     }
   },
 
-  _findXHRBreakpointIndex(p, m) {
-    return this._xhrBreakpoints.findIndex(
-      ({ path, method }) => path === p && method === m);
-  },
-
-  removeXHRBreakpoint: function(path, method) {
-    const index = this._findXHRBreakpointIndex(path, method);
-
-    if (index >= 0) {
-      this._xhrBreakpoints.splice(index, 1);
-    }
-
-    return true;
-  },
-
-  setXHRBreakpoint: function(path, method) {
-    // request.path is a string,
-    // If requested url contains the path, then we pause.
-    const index = this._findXHRBreakpointIndex(path, method);
-
-    if (index === -1) {
-      this._xhrBreakpoints.push({ path, method });
-    }
-    return true;
-  },
-
-  _onOpeningRequest: function(subject) {
-    if (this.skipBreakpoints) {
-      return;
-    }
-
-    const channel = subject.QueryInterface(Ci.nsIHttpChannel);
-    const url = channel.URI.asciiSpec;
-    const requestMethod = channel.requestMethod;
-
-    let causeType = Ci.nsIContentPolicy.TYPE_OTHER;
-    if (channel.loadInfo) {
-      causeType = channel.loadInfo.externalContentPolicyType;
-    }
-
-    const isXHR = (
-      causeType === Ci.nsIContentPolicy.TYPE_XMLHTTPREQUEST ||
-      causeType === Ci.nsIContentPolicy.TYPE_FETCH
-    );
-
-    if (!isXHR) {
-      // We currently break only if the request is either fetch or xhr
-      return;
-    }
-
-    let shouldPause = false;
-    for (const { path, method } of this._xhrBreakpoints) {
-      if (method !== "ANY" && method !== requestMethod) {
-        continue;
-      }
-      if (url.includes(path)) {
-        shouldPause = true;
-        break;
-      }
-    }
-
-    if (shouldPause) {
-      const frame = this.dbg.getNewestFrame();
-
-      // If there is no frame, this request was dispatched by logic that isn't
-      // primarily JS, so pausing the event loop wouldn't make sense.
-      // This covers background requests like loading the initial page document,
-      // or loading favicons. This also includes requests dispatched indirectly
-      // from workers. We'll need to handle them separately in the future.
-      if (frame) {
-        this._pauseAndRespond(frame, { type: "XHR" });
-      }
-    }
-  },
-
   onDetach: function(request) {
     this.destroy();
     this._state = "detached";

devtools/shared/specs/script.js

@@ -3,31 +3,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-const {Arg, RetVal, generateActorSpec} = require("devtools/shared/protocol");
+const {generateActorSpec} = require("devtools/shared/protocol");
 
 const threadSpec = generateActorSpec({
   typeName: "context",
 
-  methods: {
-    setXHRBreakpoint: {
-      request: {
-        path: Arg(0, "string"),
-        method: Arg(1, "string")
-      },
-      response: {
-        value: RetVal("boolean")
-      }
-    },
-    removeXHRBreakpoint: {
-      request: {
-        path: Arg(0, "string"),
-        method: Arg(1, "string")
-      },
-      response: {
-        value: RetVal("boolean")
-      }
-    }
-  },
+  methods: {},
 });
 
 exports.threadSpec = threadSpec;