Bug 1289571 - Set browser's userContextId before updateRemoteness in restoreTabContent. r=mikedeboer
authorJonathan Hao <jhao@mozilla.com>
Thu, 28 Jul 2016 23:54:00 +0200
changeset 349365 3f06b617447c62efd2723fba2d99ec6bacc1e126
parent 349364 a0b872e47ecf4ffda33e2e8dba4e70b874abe94e
child 349366 6010b7802ecb04364a553bff1c4bc2ffde6d8326
push id1230
push userjlund@mozilla.com
push dateMon, 31 Oct 2016 18:13:35 +0000
treeherdermozilla-release@5e06e3766db2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmikedeboer
bugs1289571
milestone50.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1289571 - Set browser's userContextId before updateRemoteness in restoreTabContent. r=mikedeboer
browser/components/sessionstore/SessionStore.jsm
--- a/browser/components/sessionstore/SessionStore.jsm
+++ b/browser/components/sessionstore/SessionStore.jsm
@@ -3365,16 +3365,19 @@ var SessionStoreInternal = {
     let window = aTab.ownerGlobal;
     let tabbrowser = window.gBrowser;
     let tabData = TabState.clone(aTab);
     let activeIndex = tabData.index - 1;
     let activePageData = tabData.entries[activeIndex] || null;
     let uri = activePageData ? activePageData.url || null : null;
     if (aLoadArguments) {
       uri = aLoadArguments.uri;
+      if (aLoadArguments.userContextId) {
+        browser.setAttribute("usercontextid", aLoadArguments.userContextId);
+      }
     }
 
     // We have to mark this tab as restoring first, otherwise
     // the "pending" attribute will be applied to the linked
     // browser, which removes it from the display list. We cannot
     // flip the remoteness of any browser that is not being displayed.
     this.markTabAsRestoring(aTab);