Bug 1246956 - Add originURI to Sessionstore. r=bz,Yoric,mfinkle

browser/components/sessionstore/SessionHistory.jsm

@@ -141,6 +141,10 @@ var SessionHistoryInternal = {
       entry.referrerPolicy = shEntry.referrerPolicy;
     }
 
+    if (shEntry.originalURI) {
+      entry.originalURI = shEntry.originalURI.spec;
+    }
+
     if (shEntry.srcdocData)
       entry.srcdocData = shEntry.srcdocData;
 
@@ -309,6 +313,9 @@ var SessionHistoryInternal = {
       shEntry.referrerURI = Utils.makeURI(entry.referrer);
       shEntry.referrerPolicy = entry.referrerPolicy;
     }
+    if (entry.originalURI) {
+      shEntry.originalURI = Utils.makeURI(entry.originalURI);
+    }
     if (entry.isSrcdocEntry)
       shEntry.srcdocData = entry.srcdocData;
     if (entry.baseURI)

mobile/android/components/SessionStore.js

@@ -752,6 +752,10 @@ SessionStore.prototype = {
       entry.referrer = aEntry.referrerURI.spec;
     }
 
+    if (aEntry.originalURI) {
+      entry.originalURI = aEntry.originalURI.spec;
+    }
+
     if (aEntry.contentType) {
       entry.contentType = aEntry.contentType;
     }
@@ -836,6 +840,10 @@ SessionStore.prototype = {
       shEntry.referrerURI = Services.io.newURI(aEntry.referrer, null, null);
     }
 
+    if (aEntry.originalURI) {
+      shEntry.originalURI =  Services.io.newURI(aEntry.originalURI, null, null);
+    }
+
     if (aEntry.cacheKey) {
       let cacheKey = Cc["@mozilla.org/supports-PRUint32;1"].createInstance(Ci.nsISupportsPRUint32);
       cacheKey.data = aEntry.cacheKey;