Bug 915511 - prevent SessionStore.getWindowValue failing with e10s. r=felipe
authorMark Hammond <mhammond@skippinet.com.au>
Thu, 12 Sep 2013 15:40:26 +1000
changeset 146778 7f4cecc6b53c4523f928cc0e2dbd60a0039a5f78
parent 146777 d45a33d0fc2e5e61d24a7a105213dedcdb4b11fc
child 146779 23708fab4a390389063e3d644a42db84178499f0
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersfelipe
bugs915511
milestone26.0a1
Bug 915511 - prevent SessionStore.getWindowValue failing with e10s. r=felipe
browser/components/sessionstore/src/SessionStore.jsm
--- a/browser/components/sessionstore/src/SessionStore.jsm
+++ b/browser/components/sessionstore/src/SessionStore.jsm
@@ -1614,16 +1614,19 @@ let SessionStoreInternal = {
     if (!(aIndex in this._closedWindows))
       throw (Components.returnCode = Cr.NS_ERROR_INVALID_ARG);
 
     // remove closed window from the array
     this._closedWindows.splice(aIndex, 1);
   },
 
   getWindowValue: function ssi_getWindowValue(aWindow, aKey) {
+    if (this._disabledForMultiProcess)
+      return "";
+
     if ("__SSi" in aWindow) {
       var data = this._windows[aWindow.__SSi].extData || {};
       return data[aKey] || "";
     }
 
     if (DyingWindowCache.has(aWindow)) {
       let data = DyingWindowCache.get(aWindow).extData || {};
       return data[aKey] || "";