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

Backout 6de71ba24d50 (bug 922835) because it was the wrong version of the patch. r=me

Browse Source
This commit is contained in:
Nick Fitzgerald 2013-10-11 14:26:13 -07:00
parent 26101212c5
commit 87d88319cc
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -467,13 +467,6 @@ ThreadActor.prototype = {
return this._sources;
},
get youngestFrame() {
if (!this.state == "paused") {
return null;
}
return this.dbg.getNewestFrame();
},
_prettyPrintWorker: null,
get prettyPrintWorker() {
if (!this._prettyPrintWorker) {
@ -1186,6 +1179,10 @@ ThreadActor.prototype = {
message: "cannot access the environment of this frame." };
}
// We'll clobber the youngest frame if the eval causes a pause, so
// save our frame now to be restored after eval returns.
// XXX: or we could just start using dbg.getNewestFrame() now that it
// works as expected.
let youngest = this.youngestFrame;
// Put ourselves back in the running state and inform the client.
@ -1741,6 +1738,10 @@ ThreadActor.prototype = {
this._state = "paused";
// Save the pause frame (if any) as the youngest frame for
// stack viewing.
this.youngestFrame = aFrame;
// Create the actor pool that will hold the pause actor and its
// children.
dbg_assert(!this._pausePool, "No pause pool should exist yet");
@ -4023,7 +4024,7 @@ function getOffsetColumn(aOffset, aScript) {
* Returns an object of the form { url, line, column }
*/
function getFrameLocation(aFrame) {
if (!aFrame || !aFrame.script) {
if (!aFrame.script) {
return { url: null, line: null, column: null };
}
return {