mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix issue reported by Aurimas at http://forums.zotero.org/discussion/25058/?Focus=140039#Comment_140039 (broken by https://bugzilla.mozilla.org/show_bug.cgi?id=761620)

Browse source
This commit is contained in:
Simon Kornblith 2012-11-22 16:35:18 -05:00
parent 09e036e6fa
commit 11d9c1df04
2 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
chrome/content/zotero/xpcom/cookieSandbox.js
View file

@ -102,7 +102,8 @@ Zotero.CookieSandbox.prototype = {
* @param {nsIInterfaceRequestor} ir
*/
"attachToInterfaceRequestor": function(ir) {
Zotero.CookieSandbox.Observer.trackedInterfaceRequestors.set(ir.QueryInterface(Components.interfaces.nsIInterfaceRequestor), this);
Zotero.CookieSandbox.Observer.trackedInterfaceRequestors.push(Components.utils.getWeakReference(ir.QueryInterface(Components.interfaces.nsIInterfaceRequestor)));
Zotero.CookieSandbox.Observer.trackedInterfaceRequestorSandboxes.push(this);
}
}
@ -125,7 +126,8 @@ Zotero.CookieSandbox.Observer = new function() {
*/
this.register = function(CookieSandbox) {
this.trackedBrowsers = new WeakMap();
this.trackedInterfaceRequestors = new WeakMap();
this.trackedInterfaceRequestors = [];
this.trackedInterfaceRequestorSandboxes = [];
if(!observing) {
Zotero.debug("CookieSandbox: Registering observers");
@ -145,8 +147,22 @@ Zotero.CookieSandbox.Observer = new function() {
// try the notification callbacks
if(notificationCallbacks) {
trackedBy = this.trackedInterfaceRequestors.get(notificationCallbacks);
if(trackedBy) {
for(var i=0; i<this.trackedInterfaceRequestors.length; i++) {
// Interface requestors are stored as weak references, so we have to see
// if they still point to something
var ir = this.trackedInterfaceRequestors[i].get();
if(!ir) {
// The interface requestor is gone, so remove it from the list
this.trackedInterfaceRequestors.splice(i--, 1);
this.trackedInterfaceRequestorSandboxes.splice(i--, 1);
} else if(ir == notificationCallbacks) {
// We are tracking this interface requestor
trackedBy = this.trackedInterfaceRequestorSandboxes[i];
break;
}
}
if(!trackedBy) {
tested = true;
} else {
// try the browser

6
chrome/content/zotero/xpcom/http.js
View file

@ -57,7 +57,7 @@ Zotero.HTTP = new function() {
_stateChange(xmlhttp, onDone, responseCharset);
};
if(cookieSandbox) cookieSandbox.attachToInterfaceRequestor(xmlhttp);
if(cookieSandbox) cookieSandbox.attachToInterfaceRequestor(xmlhttp.getInterface(Components.interfaces.nsIInterfaceRequestor));
xmlhttp.send(null);
return xmlhttp;
@ -142,7 +142,7 @@ Zotero.HTTP = new function() {
_stateChange(xmlhttp, onDone, responseCharset);
};
if(cookieSandbox) cookieSandbox.attachToInterfaceRequestor(xmlhttp);
if(cookieSandbox) cookieSandbox.attachToInterfaceRequestor(xmlhttp.getInterface(Components.interfaces.nsIInterfaceRequestor));
xmlhttp.send(body);
return xmlhttp;
@ -221,7 +221,7 @@ Zotero.HTTP = new function() {
_stateChange(xmlhttp, onDone);
};
if(cookieSandbox) cookieSandbox.attachToInterfaceRequestor(xmlhttp);
if(cookieSandbox) cookieSandbox.attachToInterfaceRequestor(xmlhttp.getInterface(Components.interfaces.nsIInterfaceRequestor));
xmlhttp.send(null);
return xmlhttp;