wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1246956 - Add loadReplace to session history. r=yoric r=mfinkle

Browse Source
This commit is contained in:
Dragana Damjanovic dd.mozilla@gmail.com 2016-03-02 12:17:22 +01:00
parent 148aad9eee
commit 4f21748be9
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
browser/components/sessionstore/SessionHistory.jsm
View File

@ -145,6 +145,10 @@ var SessionHistoryInternal = {
entry.originalURI = shEntry.originalURI.spec;
}
if (shEntry.loadReplace) {
entry.loadReplace = shEntry.loadReplace;
}
if (shEntry.srcdocData)
entry.srcdocData = shEntry.srcdocData;
@ -316,6 +320,9 @@ var SessionHistoryInternal = {
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)

8
mobile/android/components/SessionStore.js
View File

@ -756,6 +756,10 @@ SessionStore.prototype = {
entry.originalURI = aEntry.originalURI.spec;
}
if (aEntry.loadReplace) {
entry.loadReplace = aEntry.loadReplace;
}
if (aEntry.contentType) {
entry.contentType = aEntry.contentType;
}
@ -844,6 +848,10 @@ SessionStore.prototype = {
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;