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 1121034 - Pass breakpoint conditions as a separate argument;r=jlongster

Browse Source
This commit is contained in:
Eddy Bruël 2015-01-22 09:39:28 +01:00
parent 5f61d9e5c4
commit 3acf578fa3
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
toolkit/devtools/server/actors/script.js
View File

@ -2047,7 +2047,7 @@ ThreadActor.prototype = {
// Limit the search to the line numbers contained in the new script.
if (bpActor.location.line >= aScript.startLine
&& bpActor.location.line <= endLine) {
source.setBreakpoint(bpActor.location);
source.setBreakpoint(bpActor.location, bpActor.condition);
}
}
@ -2740,8 +2740,7 @@ SourceActor.prototype = {
return this.setBreakpoint({
line: loc.line,
column: loc.column,
condition: condition
});
}, condition);
}).then(response => {
var actual = response.actualLocation;
if (actual) {
@ -2810,21 +2809,20 @@ SourceActor.prototype = {
* for more information.
* @returns BreakpointActor
*/
_getOrCreateBreakpointActor: function (location) {
_getOrCreateBreakpointActor: function (location, condition) {
let actor = this.breakpointActorMap.getActor(location);
if (!actor) {
actor = new BreakpointActor(this.threadActor, {
sourceActor: this,
line: location.line,
column: location.column,
condition: location.condition
});
}, condition);
this.threadActor.threadLifetimePool.addActor(actor);
this.breakpointActorMap.setActor(location, actor);
return actor;
}
actor.condition = location.condition;
actor.condition = condition;
return actor;
},
@ -2941,14 +2939,13 @@ SourceActor.prototype = {
* The location of the breakpoint (in the generated source, if source
* mapping).
*/
setBreakpoint: function (aLocation) {
setBreakpoint: function (aLocation, aCondition) {
const location = {
sourceActor: this,
line: aLocation.line,
column: aLocation.column,
condition: aLocation.condition
column: aLocation.column
};
const actor = location.actor = this._getOrCreateBreakpointActor(location);
const actor = location.actor = this._getOrCreateBreakpointActor(location, aCondition);
// Find all scripts matching the given location. We will almost always have
// a `source` object to query, but multiple inline HTML scripts are all
@ -4718,15 +4715,15 @@ FrameActor.prototype.requestTypes = {
* - column: the specified column
* - condition: a condition which, when false, will skip the breakpoint
*/
function BreakpointActor(aThreadActor, { sourceActor, line, column, condition })
function BreakpointActor(aThreadActor, aLocation, aCondition)
{
// The set of Debugger.Script instances that this breakpoint has been set
// upon.
this.scripts = new Set();
this.threadActor = aThreadActor;
this.location = { sourceActor, line, column };
this.condition = condition;
this.location = aLocation;
this.condition = aCondition;
}
BreakpointActor.prototype = {