Merge pull request #760 from Nephyrin/master

Fix treestyletab in multiprocess (e10s) firefox

content/treestyletab/windowHelper.js

@@ -207,10 +207,12 @@ var TreeStyleTabWindowHelper = {
 		}
 
 		if ('openLinkIn' in window) {
+			// Bug 1050447 changed this line in Fx 34 to
+			// newTab = w.gBrowser.loadOneTab(
 			eval('window.openLinkIn = '+
 				window.openLinkIn.toSource().replace(
-					'browser.loadOneTab(',
-					'TreeStyleTabService.onBeforeOpenLinkWithParams(params); $&'
+					/((b|newTab = w\.gB)rowser.loadOneTab\()/g,
+					'TreeStyleTabService.onBeforeOpenLinkWithTab(gBrowser.selectedTab); $1'
 				)
 			);
 		}

modules/autoHide.js

@@ -712,12 +712,15 @@ AutoHideBrowser.prototype = {
 	},
 	showHideContentsAreaScreen : function AHB_showHideContentsAreaScreen()
 	{
+		// this.browser.contentWindow doesn't currently work in e10s
+		// mode, use this.browser.mCurrentBrowser.contentWindow as a
+		// workaround until bug 1042680 is fixed
 		if (
 			this.expanded &&
 			this.contentAreaScreenEnabled &&
 			Services.focus.activeWindow &&
 			Services.focus.activeWindow.top == this.window &&
-			this.findPluginArea(this.browser.contentWindow)
+			this.findPluginArea(this.browser.mCurrentBrowser.contentWindow)
 			) {
 			let box = this.getContentsAreaBox();
 			let style = this.screen.style;

modules/window.js

@@ -1213,11 +1213,10 @@ TreeStyleTabWindow.prototype = inherit(TreeStyleTabBase, {
 			this.handleNewTabFromCurrent(aOwner);
 	},
  
-	onBeforeOpenLinkWithParams : function TSTWindow_onBeforeOpenLinkWithParams(aParams) 
+	onBeforeOpenLinkWithTab : function TSTWindow_onBeforeOpenLinkWithParams(aTab) 
 	{
-		if (aParams.linkNode &&
-			!this.checkToOpenChildTab(aParams.linkNode.ownerDocument.defaultView))
-			this.handleNewTabFromCurrent(aParams.linkNode.ownerDocument.defaultView);
+		if (aTab && !this.checkToOpenChildTab(aTab))
+			this.handleNewTabFromCurrent(aTab);
 	},
  
 	onBeforeOpenNewTabByThirdParty : function TSTWindow_onBeforeOpenNewTabByThirdParty(aOwner)