diff options
| author | Moonchild <moonchild@palemoon.org> | 2019-08-09 08:25:37 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-09 08:25:37 +0000 |
| commit | b5b29931034caa2aae356854f13bb744def1cd13 (patch) | |
| tree | 49a7a620d38628e0f1f576a3a58538f238ad141b /dom/security/nsContentSecurityManager.cpp | |
| parent | fa4d569b93885f47c4b53430fc93bf8b12e43fcb (diff) | |
| parent | deae241f5e3db8f9b86b98933291b9a30e28db22 (diff) | |
| download | UXP-b5b29931034caa2aae356854f13bb744def1cd13.tar UXP-b5b29931034caa2aae356854f13bb744def1cd13.tar.gz UXP-b5b29931034caa2aae356854f13bb744def1cd13.tar.lz UXP-b5b29931034caa2aae356854f13bb744def1cd13.tar.xz UXP-b5b29931034caa2aae356854f13bb744def1cd13.zip | |
Merge pull request #1207 from win7-7/nsImageLoadingContent.cpp-AsyncOpen2
Convert dom/base/nsImageLoadingContent.cpp to use AsyncOpen2 and followups along with it (1445670 and 1373780 part 2 and 3)
Diffstat (limited to 'dom/security/nsContentSecurityManager.cpp')
| -rw-r--r-- | dom/security/nsContentSecurityManager.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/dom/security/nsContentSecurityManager.cpp b/dom/security/nsContentSecurityManager.cpp index 08fd9afd9..5c6701992 100644 --- a/dom/security/nsContentSecurityManager.cpp +++ b/dom/security/nsContentSecurityManager.cpp @@ -10,6 +10,7 @@ #include "nsIStreamListener.h" #include "nsCDefaultURIFixup.h" #include "nsIURIFixup.h" +#include "nsIImageLoadingContent.h" #include "mozilla/dom/Element.h" #include "mozilla/dom/TabChild.h" @@ -123,7 +124,7 @@ nsContentSecurityManager::CheckFTPSubresourceLoad(nsIChannel* aChannel) nsCOMPtr<nsIURI> uri; nsresult rv = NS_GetFinalChannelURI(aChannel, getter_AddRefs(uri)); - NS_ENSURE_SUCCESS(rv, rv); + NS_ENSURE_SUCCESS(rv, rv); if (!uri) { return NS_OK; } @@ -801,6 +802,8 @@ nsContentSecurityManager::CheckChannel(nsIChannel* aChannel) // within nsCorsListenerProxy rv = DoCheckLoadURIChecks(uri, loadInfo); NS_ENSURE_SUCCESS(rv, rv); + // TODO: Bug 1371237 + // consider calling SetBlockedRequest in nsContentSecurityManager::CheckChannel } return NS_OK; |