Bug 1222087: Part 1 - Fix ignoring of exceptions in blackboxed code. r=fitzgen
authorKris Maglione <maglione.k@gmail.com>
Mon, 22 Feb 2016 14:54:36 -0800
changeset 321677 a8dd21de7df752056c99883ecd1e4cd19f65e82c
parent 321676 fdf9c9e0ea677b11923b36c30d4a001e4bc22cee
child 321678 c96b93b4d7c0d16b3ae95c4fff365df9d3564adc
push id5913
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 16:57:49 +0000
treeherdermozilla-beta@dcaf0a6fa115 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfitzgen
bugs1222087
milestone47.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 1222087: Part 1 - Fix ignoring of exceptions in blackboxed code. r=fitzgen MozReview-Commit-ID: vtu1ou4ueT
devtools/server/actors/script.js
devtools/server/tests/unit/test_blackboxing-05.js
--- a/devtools/server/actors/script.js
+++ b/devtools/server/actors/script.js
@@ -1842,19 +1842,19 @@ ThreadActor.prototype = {
       }
     }
 
     if (willBeCaught && this._options.ignoreCaughtExceptions) {
       return undefined;
     }
 
     const generatedLocation = this.sources.getFrameLocation(aFrame);
-    const { sourceActor } = this.unsafeSynchronize(this.sources.getOriginalLocation(
+    const { originalSourceActor } = this.unsafeSynchronize(this.sources.getOriginalLocation(
       generatedLocation));
-    const url = sourceActor ? sourceActor.url : null;
+    const url = originalSourceActor ? originalSourceActor.url : null;
 
     if (this.sources.isBlackBoxed(url)) {
       return undefined;
     }
 
     try {
       let packet = this._paused(aFrame);
       if (!packet) {
--- a/devtools/server/tests/unit/test_blackboxing-05.js
+++ b/devtools/server/tests/unit/test_blackboxing-05.js
@@ -68,17 +68,17 @@ function test_black_box_exception() {
     do_check_true(!error, "Should not get an error: " + error);
     let sourceClient = gThreadClient.source(sources.filter(s => s.url == BLACK_BOXED_URL)[0]);
 
     sourceClient.blackBox(function ({error}) {
       do_check_true(!error, "Should not get an error: " + error);
       gThreadClient.pauseOnExceptions(true);
 
       gClient.addOneTimeListener("paused", function (aEvent, aPacket) {
-        do_check_neq(aPacket.frame.where.url, BLACK_BOXED_URL,
-                     "We shouldn't pause while in the black boxed source.");
+        do_check_eq(aPacket.frame.where.source.url, SOURCE_URL,
+                    "We shouldn't pause while in the black boxed source.");
         finishClient(gClient);
       });
 
       gThreadClient.resume();
     });
   });
 }