diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-05-19 14:21:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-19 14:21:00 +0200 |
| commit | ffb32138cbe23dc275ec409770246739f9678cef (patch) | |
| tree | 3ffdf70469a762ad18861913690cdaf37be90a16 /netwerk/base/nsBaseChannel.cpp | |
| parent | 3da22ea943f6e7840558ddd1e4b473bef5837873 (diff) | |
| parent | 41757ae2c034a3bc549cba88e99d55ea2db7ca12 (diff) | |
| download | UXP-ffb32138cbe23dc275ec409770246739f9678cef.tar UXP-ffb32138cbe23dc275ec409770246739f9678cef.tar.gz UXP-ffb32138cbe23dc275ec409770246739f9678cef.tar.lz UXP-ffb32138cbe23dc275ec409770246739f9678cef.tar.xz UXP-ffb32138cbe23dc275ec409770246739f9678cef.zip | |
Merge pull request #1554 from MoonchildProductions/deunify_netwerk
Deunify netwerk
Diffstat (limited to 'netwerk/base/nsBaseChannel.cpp')
| -rw-r--r-- | netwerk/base/nsBaseChannel.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/netwerk/base/nsBaseChannel.cpp b/netwerk/base/nsBaseChannel.cpp index 200804c1e..2575fac04 100644 --- a/netwerk/base/nsBaseChannel.cpp +++ b/netwerk/base/nsBaseChannel.cpp @@ -21,9 +21,12 @@ #include "nsProxyRelease.h" #include "nsXULAppAPI.h" #include "nsContentSecurityManager.h" -#include "LoadInfo.h" +#include "mozilla/LoadInfo.h" #include "nsServiceManagerUtils.h" +using namespace mozilla; +using namespace mozilla::net; + // This class is used to suspend a request across a function scope. class ScopedRequestSuspender { public: @@ -87,7 +90,7 @@ nsBaseChannel::Redirect(nsIChannel *newChannel, uint32_t redirectFlags, nsSecurityFlags secFlags = mLoadInfo->GetSecurityFlags() & ~nsILoadInfo::SEC_FORCE_INHERIT_PRINCIPAL; nsCOMPtr<nsILoadInfo> newLoadInfo = - static_cast<mozilla::LoadInfo*>(mLoadInfo.get())->CloneWithNewSecFlags(secFlags); + static_cast<LoadInfo*>(mLoadInfo.get())->CloneWithNewSecFlags(secFlags); nsCOMPtr<nsIPrincipal> uriPrincipal; nsIScriptSecurityManager *sm = nsContentUtils::GetSecurityManager(); |