Merge pull request #8420 from mozilla/revert-8390-bug-1319111

Revert "Upstream changes from: Bug 1319111 - Expose result principal URL ("final channel URL") on LoadInfo, convert current consumers of LOAD_REPLACE"
This commit is contained in:
Jonas Jenwald 2017-05-18 12:22:02 +02:00 committed by GitHub
commit 658fb03db1

View File

@ -1011,14 +1011,6 @@ PdfStreamConverter.prototype = {
// Keep the URL the same so the browser sees it as the same.
channel.originalURI = aRequest.URI;
//#if MOZCENTRAL
channel.loadInfo.resultPrincipalURI = aRequest.loadInfo.resultPrincipalURI;
//#else
if ("resultPrincipalURI" in aRequest.loadInfo) {
channel.loadInfo.resultPrincipalURI =
aRequest.loadInfo.resultPrincipalURI;
}
//#endif
channel.loadGroup = aRequest.loadGroup;
channel.loadInfo.originAttributes = aRequest.loadInfo.originAttributes;