diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-12-14 12:50:01 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-12-14 12:50:01 +0100 |
| commit | fea96b4527a2db6cd97c9053d647478b347d3853 (patch) | |
| tree | eeb73acd7f8295dbab17ec993392bce3161be9db /ipc/glue | |
| parent | 2e69b03ddd11de777e6d52a995ff0d1675eb58d2 (diff) | |
| download | UXP-fea96b4527a2db6cd97c9053d647478b347d3853.tar UXP-fea96b4527a2db6cd97c9053d647478b347d3853.tar.gz UXP-fea96b4527a2db6cd97c9053d647478b347d3853.tar.lz UXP-fea96b4527a2db6cd97c9053d647478b347d3853.tar.xz UXP-fea96b4527a2db6cd97c9053d647478b347d3853.zip | |
Do not report resource-timing subdocument loads triggered by that subdocument.
Diffstat (limited to 'ipc/glue')
| -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 |