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 1066447 - Make cloudsync test work in e10s (r=ttaubert)

Browse Source
This commit is contained in:
Bill McCloskey 2014-09-18 08:56:55 -07:00
parent b4a19a84c8
commit 95c664894c
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
services/cloudsync/CloudSyncTabs.jsm
View File

@ -148,8 +148,7 @@ this.Tabs = function () {
let update = function (event) {
if (event.originalTarget.linkedBrowser) {
let win = event.originalTarget.linkedBrowser.contentWindow;
if (PrivateBrowsingUtils.isWindowPrivate(win) &&
if (PrivateBrowsingUtils.isBrowserPrivate(event.originalTarget.linkedBrowser) &&
!PrivateBrowsingUtils.permanentPrivateBrowsing) {
return;
}

6
toolkit/modules/PrivateBrowsingUtils.jsm
View File

@ -16,10 +16,16 @@ const Cc = Components.classes;
const Ci = Components.interfaces;
this.PrivateBrowsingUtils = {
// Rather than passing content windows to this function, please use
// isBrowserPrivate since it works with e10s.
isWindowPrivate: function pbu_isWindowPrivate(aWindow) {
return this.privacyContextFromWindow(aWindow).usePrivateBrowsing;
},
isBrowserPrivate: function(aBrowser) {
return this.isWindowPrivate(aBrowser.ownerDocument.defaultView);
},
privacyContextFromWindow: function pbu_privacyContextFromWindow(aWindow) {
return aWindow.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIWebNavigation)