summaryrefslogtreecommitdiff
path: root/ipc
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-12-14 12:50:01 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-12-14 12:50:01 +0100
commitfea96b4527a2db6cd97c9053d647478b347d3853 (patch)
treeeeb73acd7f8295dbab17ec993392bce3161be9db /ipc
parent2e69b03ddd11de777e6d52a995ff0d1675eb58d2 (diff)
downloaduxp-fea96b4527a2db6cd97c9053d647478b347d3853.tar.gz
Do not report resource-timing subdocument loads triggered by that subdocument.
Diffstat (limited to 'ipc')
-rw-r--r--ipc/glue/BackgroundUtils.cpp13
1 files changed, 9 insertions, 4 deletions
diff --git a/ipc/glue/BackgroundUtils.cpp b/ipc/glue/BackgroundUtils.cpp
index 44f988efda..6f7501f703 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