Upstream changes from: Bug 1319111 - Expose result principal URL ("final channel URL") on LoadInfo, convert current consumers of LOAD_REPLACE

This is a downstream change introduced in [1]. That mozilla bug is adding a new property to channel's loadinfo object (nsILoadInfo) that protocol handlers has to set on channels when originalURI on the result channel is set to a different URI than the channel has been created for.

Existence of the new property on nsILoadInfo depends on landing [1].

[1] https://bugzilla.mozilla.org/show_bug.cgi?id=1319111
This commit is contained in:
Honza Bambas :mayhemer 2017-05-03 18:24:46 +02:00 committed by Jonas Jenwald
parent 7015c88ce9
commit 20aa8d74e9

View File

@ -1013,6 +1013,14 @@ 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;