Bug 967234: Don't block self-hosted code in the devtool client code; Debugger takes care of this. r=ejpbruel

--HG--
extra : rebase_source : 6939941cb3c486a3541518a594b28af6b153f243
This commit is contained in:
Jim Blandy 2014-12-23 16:47:52 -08:00
parent 0c98280b6a
commit e002e32fc9
5 changed files with 9 additions and 17 deletions

View File

@ -8,7 +8,7 @@
const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
const DBG_STRINGS_URI = "chrome://browser/locale/devtools/debugger.properties";
const NEW_SOURCE_IGNORED_URLS = ["debugger eval code", "self-hosted", "XStringBundle"];
const NEW_SOURCE_IGNORED_URLS = ["debugger eval code", "XStringBundle"];
const NEW_SOURCE_DISPLAY_DELAY = 200; // ms
const FETCH_SOURCE_RESPONSE_DELAY = 200; // ms
const FETCH_EVENT_LISTENERS_DELAY = 200; // ms

View File

@ -97,7 +97,7 @@ const CONSOLE_API_LEVELS_TO_SEVERITIES = {
};
// Array of known message source URLs we need to hide from output.
const IGNORED_SOURCE_URLS = ["debugger eval code", "self-hosted"];
const IGNORED_SOURCE_URLS = ["debugger eval code"];
// The maximum length of strings to be displayed by the Web Console.
const MAX_LONG_STRING_LENGTH = 200000;

View File

@ -52,7 +52,7 @@ const VARIABLES_VIEW_URL = "chrome://browser/content/devtools/widgets/VariablesV
const CONSOLE_DIR_VIEW_HEIGHT = 0.6;
const IGNORED_SOURCE_URLS = ["debugger eval code", "self-hosted"];
const IGNORED_SOURCE_URLS = ["debugger eval code"];
// The amount of time in milliseconds that we wait before performing a live
// search.

View File

@ -448,14 +448,14 @@ function ThreadActor(aParent, aGlobal)
autoBlackBox: false
};
this.breakpointActorMap = new BreakpointActorMap();
this.sourceActorStore = new SourceActorStore();
this.blackBoxedSources = new Set(["self-hosted"]);
this.prettyPrintedSources = new Map();
this.breakpointActorMap = new BreakpointActorMap;
this.sourceActorStore = new SourceActorStore;
this.blackBoxedSources = new Set;
this.prettyPrintedSources = new Map;
// A map of actorID -> actor for breakpoints created and managed by the
// server.
this._hiddenBreakpoints = new Map();
this._hiddenBreakpoints = new Map;
this.global = aGlobal;

View File

@ -20,11 +20,7 @@ function getFrameDepth(frame) {
if (!frame.older) {
frame.depth = 0;
} else {
// Hide depth from self-hosted frames.
const increment = frame.script && frame.script.url == "self-hosted"
? 0
: 1;
frame.depth = increment + getFrameDepth(frame.older);
frame.depth = getFrameDepth(frame.older) + 1;
}
}
@ -265,10 +261,6 @@ TracerActor.prototype = {
* The stack frame that was entered.
*/
onEnterFrame: function(aFrame) {
if (aFrame.script && aFrame.script.url == "self-hosted") {
return;
}
Task.spawn(function*() {
// This function might request original (i.e. source-mapped) location,
// which is asynchronous. We need to ensure that packets are sent out