import changes from tenfourfox:

- #525: improve message (5742c507e)
- closes #535: add TLD update to upcert script and pull up for testing (de66c97d                                                                      a)
- #534: M1505181 M1506640 (5fc65abad)
- #534: M1499861 M1500759 M1500310 M1507907 (6db6f6ac2)
- #534: M1487964 (8126d332a)
- #534: M1499028 M1510471 (3cf019ddc)
- #534: update certs, pins, TLDs (924456ed5)
and remove 104fx scripts.
This commit is contained in:
2018-11-30 11:59:24 +08:00
parent 88d6f807c3
commit 8a85bb8ef4
31 changed files with 6738 additions and 2488 deletions
+7 -4
View File
@@ -3072,14 +3072,17 @@ HttpBaseChannel::GetPerformance()
return nullptr;
}
// We only add to the document's performance object if it has the same
// principal as the one triggering the load. This is to prevent navigations
// triggered _by_ the iframe from showing up in the parent document's
// performance entries if they have different origins.
if (!mLoadInfo->TriggeringPrincipal()->Equals(loadingDocument->NodePrincipal())) {
return nullptr;
}
if (mLoadInfo->GetExternalContentPolicyType() == nsIContentPolicy::TYPE_SUBDOCUMENT &&
!mLoadInfo->GetIsFromProcessingFrameAttributes()) {
// We only report loads caused by processing the attributes of the
// browsing context container.
return nullptr;
}
nsCOMPtr<nsPIDOMWindow> innerWindow = loadingDocument->GetInnerWindow();
if (!innerWindow) {
return nullptr;