wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1124106 - Don't show unnamed eval sources in the debugger. r=ejpbruel

Browse Source
This commit is contained in:
James Long 2015-02-19 13:59:00 -05:00
parent 94799a3061
commit c79dcaaf51
3 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
browser/devtools/debugger/debugger-panes.js
View File

@ -136,9 +136,8 @@ SourcesView.prototype = Heritage.extend(WidgetMethods, {
* - staged: true to stage the item to be appended later
*/
addSource: function(aSource, aOptions = {}) {
if (!(aSource.url || aSource.introductionUrl)) {
// These would be most likely eval scripts introduced in inline
// JavaScript in HTML, and we don't show those yet (bug 1097873)
if (!aSource.url) {
// We don't show any unnamed eval scripts yet (see bug 1124106)
return;
}
@ -170,21 +169,10 @@ SourcesView.prototype = Heritage.extend(WidgetMethods, {
},
_parseUrl: function(aSource) {
let fullUrl = aSource.url || aSource.introductionUrl;
let fullUrl = aSource.url;
let url = fullUrl.split(" -> ").pop();
let label = aSource.addonPath ? aSource.addonPath : SourceUtils.getSourceLabel(url);
let group;
if (!aSource.url && aSource.introductionUrl) {
label += ' > ' + aSource.introductionType;
group = L10N.getStr("evalGroupLabel");
}
else if(aSource.addonID) {
group = aSource.addonID;
}
else {
group = SourceUtils.getSourceGroup(url);
}
let group = aSource.addonID ? aSource.addonID : SourceUtils.getSourceGroup(url);
return {
label: label,

2
browser/devtools/debugger/test/browser.ini
View File

@ -407,7 +407,7 @@ skip-if = e10s # Bug 1093535
[browser_dbg_sources-cache.js]
skip-if = e10s && debug
[browser_dbg_sources-eval-01.js]
skip-if = e10s && debug
skip-if = true # non-named eval sources turned off for now, bug 1124106
[browser_dbg_sources-eval-02.js]
skip-if = e10s && debug
[browser_dbg_sources-labels.js]

6
browser/devtools/debugger/test/browser_dbg_breakpoints-eval.js
View File

@ -28,16 +28,16 @@ function test() {
function run() {
return Task.spawn(function*() {
let newSource = waitForDebuggerEvents(gPanel, gDebugger.EVENTS.NEW_SOURCE);
callInTab(gTab, "evalSource");
callInTab(gTab, "evalSourceWithSourceURL");
yield newSource;
yield gPanel.addBreakpoint({ actor: gSources.values[1], line: 2 });
yield gPanel.addBreakpoint({ actor: gSources.values[0], line: 2 });
yield ensureThreadClientState(gPanel, "resumed");
const paused = waitForThreadEvents(gPanel, "paused");
callInTab(gTab, "bar");
let frame = (yield paused).frame;
is(frame.where.source.actor, gSources.values[1], "Should have broken on the eval'ed source");
is(frame.where.source.actor, gSources.values[0], "Should have broken on the eval'ed source");
is(frame.where.line, 2, "Should break on line 2");
yield resumeDebuggerThenCloseAndFinish(gPanel);