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 1116714 part 1 - Store the document where we added anonomous content so we can call removeAnonymousContent() on it later without throwing. r=pbrosset

Browse Source 
Store GlobalForObject for the document too to wallpaper weird devtools
test failures.  Filed as bug 1123362.
This commit is contained in:
Mats Palmgren 2015-01-20 18:20:03 +00:00
parent ccf63d141d
commit ff5524e902
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
toolkit/devtools/server/actors/highlighter.js
View File

@ -421,6 +421,9 @@ let CustomHighlighterFront = protocol.FrontClass(CustomHighlighterActor, {});
function CanvasFrameAnonymousContentHelper(tabActor, nodeBuilder) {
this.tabActor = tabActor;
this.nodeBuilder = nodeBuilder;
this.anonymousContentDocument = this.tabActor.window.document;
// XXX the next line is a wallpaper for bug 1123362.
this.anonymousContentGlobal = Cu.getGlobalForObject(this.anonymousContentDocument);
this._insert();
@ -433,11 +436,13 @@ CanvasFrameAnonymousContentHelper.prototype = {
// If the current window isn't the one the content was inserted into, this
// will fail, but that's fine.
try {
let doc = this.tabActor.window.document;
let doc = this.anonymousContentDocument;
doc.removeAnonymousContent(this._content);
} catch (e) {}
} catch (e) {console.error(e)}
events.off(this.tabActor, "navigate", this._onNavigate);
this.tabActor = this.nodeBuilder = this._content = null;
this.anonymousContentDocument = null;
this.anonymousContentGlobal = null;
},
_insert: function() {