Created
January 13, 2019 13:00
-
-
Save valenting/434307c8343abefef46e819c6774d77a to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/browser/components/sessionstore/SessionStore.jsm b/browser/components/sessionstore/SessionStore.jsm | |
--- a/browser/components/sessionstore/SessionStore.jsm | |
+++ b/browser/components/sessionstore/SessionStore.jsm | |
@@ -2281,18 +2281,18 @@ var SessionStoreInternal = { | |
}, | |
/** | |
* Perform a destructive process switch into a distinct process. | |
* This method is asynchronous, as it requires multiple calls into content | |
* processes. | |
*/ | |
async _doProcessSwitch(aBrowser, aRemoteType, aChannel, aSwitchId) { | |
- ChromeUtils.releaseAssert(aRemoteType != E10SUtils.NOT_REMOTE, | |
- "Cannot flip http(s):// result to non-remote"); | |
+ // ChromeUtils.releaseAssert(aRemoteType != E10SUtils.NOT_REMOTE, | |
+ // "Cannot flip http(s):// result to non-remote"); | |
// Don't try to switch tabs before delayed startup is completed. | |
await aBrowser.ownerGlobal.delayedStartupPromise; | |
// Perform a navigateAndRestore to trigger the process switch. | |
let tab = aBrowser.ownerGlobal.gBrowser.getTabForBrowser(aBrowser); | |
let loadArguments = { | |
newFrameloader: true, // Switch even if remoteType hasn't changed. | |
@@ -2341,17 +2341,17 @@ var SessionStoreInternal = { | |
if (browsingContext.parent) { | |
return; // Not a toplevel load, can't flip procs. | |
} | |
// FIXME: We should be able to know rootFrameLoader without | |
// windowGlobalParent! | |
let wgp = browsingContext.currentWindowGlobal; | |
- ChromeUtils.releaseAssert(wgp, "How'd we get here!"); | |
+ // ChromeUtils.releaseAssert(wgp, "How'd we get here!"); | |
if (!wgp || !wgp.rootFrameLoader) { | |
return; // Not an embedded browsing context (e.g. chrome window). | |
} | |
let browser = wgp.rootFrameLoader.ownerElement; | |
if (browser.tagName !== "browser") { | |
console.warn("warning: Not a xul:browser element:", browser.tagName); | |
return; // Not a vanilla xul:browser element performing embedding. | |
diff --git a/toolkit/components/remotebrowserutils/tests/browser/browser_httpResponseProcessSelection.js b/toolkit/components/remotebrowserutils/tests/browser/browser_httpResponseProcessSelection.js | |
--- a/toolkit/components/remotebrowserutils/tests/browser/browser_httpResponseProcessSelection.js | |
+++ b/toolkit/components/remotebrowserutils/tests/browser/browser_httpResponseProcessSelection.js | |
@@ -53,13 +53,13 @@ add_task(async function test_postFromFil | |
}); | |
} | |
let PREF_NAME = "browser.tabs.remote.useHTTPResponseProcessSelection"; | |
await SpecialPowers.pushPrefEnv({set: [[PREF_NAME, false]]}); | |
await singleTest(E10SUtils.FILE_REMOTE_TYPE); | |
// NOTE: Currently Broken | |
- // await SpecialPowers.pushPrefEnv({set: [[PREF_NAME, true]]}); | |
- // await singleTest(E10SUtils.DEFAULT_REMOTE_TYPE); | |
+ await SpecialPowers.pushPrefEnv({set: [[PREF_NAME, true]]}); | |
+ await singleTest(E10SUtils.DEFAULT_REMOTE_TYPE); | |
}); | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment