diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-12-18 11:39:00 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-12-18 11:39:00 +0100 |
| commit | 76fe52eb81db323ceaa8396de39b76efbce1c25e (patch) | |
| tree | 061c409281374d893f9730f89e6a4ef32d0b53f9 /ipc | |
| parent | 63635e38ff9341c02fae7f4557d230ec710947b6 (diff) | |
| parent | 680c3eadb6aaec1f3653636db081a519e0f62ef5 (diff) | |
| download | UXP-76fe52eb81db323ceaa8396de39b76efbce1c25e.tar UXP-76fe52eb81db323ceaa8396de39b76efbce1c25e.tar.gz UXP-76fe52eb81db323ceaa8396de39b76efbce1c25e.tar.lz UXP-76fe52eb81db323ceaa8396de39b76efbce1c25e.tar.xz UXP-76fe52eb81db323ceaa8396de39b76efbce1c25e.zip | |
Merge branch 'master' into Basilisk-releasev2018.12.18
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/glue/BackgroundUtils.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/ipc/glue/BackgroundUtils.cpp b/ipc/glue/BackgroundUtils.cpp index 44f988efd..6f7501f70 100644 --- a/ipc/glue/BackgroundUtils.cpp +++ b/ipc/glue/BackgroundUtils.cpp @@ -295,7 +295,8 @@ LoadInfoToLoadInfoArgs(nsILoadInfo *aLoadInfo, aLoadInfo->CorsUnsafeHeaders(), aLoadInfo->GetForcePreflight(), aLoadInfo->GetIsPreflight(), - aLoadInfo->GetLoadTriggeredFromExternal() + aLoadInfo->GetLoadTriggeredFromExternal(), + aLoadInfo->GetIsFromProcessingFrameAttributes() ); return NS_OK; @@ -347,7 +348,7 @@ LoadInfoArgsToLoadInfo(const OptionalLoadInfoArgs& aOptionalLoadInfoArgs, redirectChain.AppendElement(redirectedPrincipal.forget()); } - nsCOMPtr<nsILoadInfo> loadInfo = + RefPtr<mozilla::LoadInfo> loadInfo = new mozilla::LoadInfo(loadingPrincipal, triggeringPrincipal, principalToInherit, @@ -375,8 +376,12 @@ LoadInfoArgsToLoadInfo(const OptionalLoadInfoArgs& aOptionalLoadInfoArgs, loadInfoArgs.loadTriggeredFromExternal() ); - loadInfo.forget(outLoadInfo); - return NS_OK; + if (loadInfoArgs.isFromProcessingFrameAttributes()) { + loadInfo->SetIsFromProcessingFrameAttributes(); + } + + loadInfo.forget(outLoadInfo); + return NS_OK; } } // namespace ipc |