Bug 1490858 - Update comm-central for nsISHEntry changes. r=frg
authorNicholas Nethercote <nnethercote@mozilla.com>
Fri, 14 Sep 2018 13:30:40 +1000
changeset 33160 4fa52926ba4ca23231d2df2c5ce819666bbf4652
parent 33159 4a211a1901dd5017780dc5667aad3b1ecb2d308e
child 33161 d0a694c28bf8646db77f58c39e3ac3bc65b3764c
push id387
push userclokep@gmail.com
push dateMon, 10 Dec 2018 21:30:47 +0000
reviewersfrg
bugs1490858
Bug 1490858 - Update comm-central for nsISHEntry changes. r=frg nsISHEntry.{URI,isSubFrame} both lost an explicit setter, but became mutable.
suite/components/sessionstore/nsSessionStore.js
--- a/suite/components/sessionstore/nsSessionStore.js
+++ b/suite/components/sessionstore/nsSessionStore.js
@@ -2855,20 +2855,20 @@ SessionStoreService.prototype = {
    * @returns nsISHEntry
    */
   _deserializeHistoryEntry:
     function sss_deserializeHistoryEntry(aEntry, aIdMap, aDocIdentMap) {
 
     var shEntry = Cc["@mozilla.org/browser/session-history-entry;1"]
                     .createInstance(Ci.nsISHEntry);
 
-    shEntry.setURI(this._getURIFromString(aEntry.url));
+    shEntry.URI = this._getURIFromString(aEntry.url);
     shEntry.title = aEntry.title || aEntry.url;
     if (aEntry.subframe)
-      shEntry.setIsSubFrame(aEntry.subframe || false);
+      shEntry.isSubFrame = aEntry.subframe || false;
     shEntry.loadType = Ci.nsIDocShellLoadInfo.loadHistory;
     if (aEntry.contentType)
       shEntry.contentType = aEntry.contentType;
     if (aEntry.referrer)
       shEntry.referrerURI = this._getURIFromString(aEntry.referrer);
 
     if (aEntry.cacheKey) {
       var cacheKey = Cc["@mozilla.org/supports-PRUint32;1"]