Merge pull request #8390 from Snuffleupagus/bug-1319111
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:
commit
0dbc68a6d6
@ -1013,6 +1013,14 @@ PdfStreamConverter.prototype = {
|
|||||||
|
|
||||||
// Keep the URL the same so the browser sees it as the same.
|
// Keep the URL the same so the browser sees it as the same.
|
||||||
channel.originalURI = aRequest.URI;
|
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.loadGroup = aRequest.loadGroup;
|
||||||
channel.loadInfo.originAttributes = aRequest.loadInfo.originAttributes;
|
channel.loadInfo.originAttributes = aRequest.loadInfo.originAttributes;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user