Fallback to use tab attribute, if check for content window failed

(workaround for #208)
Infocatcher · Jan 30, 2016 · 19d1f63 · 19d1f63
1 parent e4442e0
commit 19d1f63
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/bootstrap.js b/bootstrap.js
@@ -4035,7 +4035,14 @@ var privateTab = {
 		return window && PrivateBrowsingUtils._privateTabOrigIsWindowPrivate(window);
 	},
 	isPrivateContent: function(window) {
-		return this.isPrivateWindow(this.getContentWindow(window));
+		try {
+			return this.isPrivateWindow(this.getContentWindow(window));
+		}
+		catch(e) {
+			_log("isPrivateContent() failed. Electrolysis? Fallback to check private attribute");
+			Components.utils.reportError(e);
+		}
+		return window.gBrowser.selectedTab.hasAttribute(this.privateAttr);
 	},
 	getContentWindow: function(window) {
 		// Note: with enabled Electrolysis window.content may refers to