author | Dragana Damjanovic dd.mozilla@gmail.com |
Wed, 02 Mar 2016 12:17:22 +0100 | |
changeset 324695 | 3dcc4b8b947d512e96b65c4e5e204bd5d7d15ace |
parent 324694 | 3f9ad35634177abfa44b4ab701487c1d3f67f527 |
child 324696 | 11e3aa6fb74dcb652b3ccdfc457780a5a0b70237 |
push id | 1128 |
push user | jlund@mozilla.com |
push date | Wed, 01 Jun 2016 01:31:59 +0000 |
treeherder | mozilla-release@fe0d30de989d [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | yoric, mfinkle |
bugs | 1246956 |
milestone | 47.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
|
browser/components/sessionstore/SessionHistory.jsm | file | annotate | diff | comparison | revisions | |
mobile/android/components/SessionStore.js | file | annotate | diff | comparison | revisions |
--- a/browser/components/sessionstore/SessionHistory.jsm +++ b/browser/components/sessionstore/SessionHistory.jsm @@ -140,16 +140,20 @@ var SessionHistoryInternal = { entry.referrer = shEntry.referrerURI.spec; entry.referrerPolicy = shEntry.referrerPolicy; } if (shEntry.originalURI) { entry.originalURI = shEntry.originalURI.spec; } + if (shEntry.loadReplace) { + entry.loadReplace = shEntry.loadReplace; + } + if (shEntry.srcdocData) entry.srcdocData = shEntry.srcdocData; if (shEntry.isSrcdocEntry) entry.isSrcdocEntry = shEntry.isSrcdocEntry; if (shEntry.baseURI) entry.baseURI = shEntry.baseURI.spec; @@ -311,16 +315,19 @@ var SessionHistoryInternal = { shEntry.contentType = entry.contentType; if (entry.referrer) { shEntry.referrerURI = Utils.makeURI(entry.referrer); shEntry.referrerPolicy = entry.referrerPolicy; } if (entry.originalURI) { shEntry.originalURI = Utils.makeURI(entry.originalURI); } + if (entry.loadReplace) { + shEntry.loadReplace = entry.loadReplace; + } if (entry.isSrcdocEntry) shEntry.srcdocData = entry.srcdocData; if (entry.baseURI) shEntry.baseURI = Utils.makeURI(entry.baseURI); if (entry.cacheKey) { var cacheKey = Cc["@mozilla.org/supports-PRUint32;1"]. createInstance(Ci.nsISupportsPRUint32);
--- a/mobile/android/components/SessionStore.js +++ b/mobile/android/components/SessionStore.js @@ -751,16 +751,20 @@ SessionStore.prototype = { if (aEntry.referrerURI) { entry.referrer = aEntry.referrerURI.spec; } if (aEntry.originalURI) { entry.originalURI = aEntry.originalURI.spec; } + if (aEntry.loadReplace) { + entry.loadReplace = aEntry.loadReplace; + } + if (aEntry.contentType) { entry.contentType = aEntry.contentType; } if (aEntry.scrollRestorationIsManual) { entry.scrollRestorationIsManual = true; } else { let x = {}, y = {}; @@ -839,16 +843,20 @@ SessionStore.prototype = { if (aEntry.referrer) { shEntry.referrerURI = Services.io.newURI(aEntry.referrer, null, null); } if (aEntry.originalURI) { shEntry.originalURI = Services.io.newURI(aEntry.originalURI, null, null); } + if (aEntry.loadReplace) { + shEntry.loadReplace = aEntry.loadReplace; + } + if (aEntry.cacheKey) { let cacheKey = Cc["@mozilla.org/supports-PRUint32;1"].createInstance(Ci.nsISupportsPRUint32); cacheKey.data = aEntry.cacheKey; shEntry.cacheKey = cacheKey; } if (aEntry.ID) { // get a new unique ID for this frame (since the one from the last