mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1446933 - Remove 'using namespace mozilla::net' from BackgroundUtils.h, r=qdot

This commit is contained in:
Andrea Marchesini 2018-05-30 21:21:17 +02:00
Родитель 4dbf30fc68
Коммит 1273dc5391
33 изменённых файлов: 94 добавлений и 88 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

36
docshell/base/nsDocShell.cpp
Просмотреть файл

@ -225,6 +225,7 @@
using namespace mozilla;
using namespace mozilla::dom;
using namespace mozilla::net;
// Threshold value in ms for META refresh based redirects
#define REFRESH_REDIRECT_TIMER 15000
@ -683,7 +684,7 @@ nsDocShell::LoadURI(nsIURI* aURI,
bool inheritPrincipal = false;
bool principalIsExplicit = false;
bool sendReferrer = true;
uint32_t referrerPolicy = mozilla::net::RP_Unset;
uint32_t referrerPolicy = RP_Unset;
bool isSrcdoc = false;
nsCOMPtr<nsISHEntry> shEntry;
nsString target;
@ -4223,7 +4224,7 @@ nsDocShell::LoadURI(const char16_t* aURI,
nsIPrincipal* aTriggeringPrincipal)
{
return LoadURIWithOptions(aURI, aLoadFlags, aReferringURI,
mozilla::net::RP_Unset, aPostStream,
RP_Unset, aPostStream,
aHeaderStream, nullptr, aTriggeringPrincipal);
}
@ -4919,8 +4920,7 @@ nsDocShell::LoadErrorPage(nsIURI* aURI, const char16_t* aURL,
nsresult rv = NS_NewURI(getter_AddRefs(errorPageURI), errorPageUrl);
NS_ENSURE_SUCCESS(rv, rv);
return InternalLoad(errorPageURI, nullptr, Nothing(), false, nullptr,
mozilla::net::RP_Unset,
return InternalLoad(errorPageURI, nullptr, Nothing(), false, nullptr, RP_Unset,
nsContentUtils::GetSystemPrincipal(), nullptr,
INTERNAL_LOAD_FLAGS_NONE, EmptyString(),
nullptr, VoidString(), nullptr, nullptr,
@ -7472,8 +7472,7 @@ nsDocShell::EndPageLoad(nsIWebProgress* aProgress,
// If we have a host
nsCOMPtr<nsILoadInfo> loadInfo = aChannel->GetLoadInfo();
if (loadInfo) {
mozilla::net::PredictorLearnRedirect(url, aChannel,
loadInfo->GetOriginAttributes());
PredictorLearnRedirect(url, aChannel, loadInfo->GetOriginAttributes());
}
}
@ -10202,10 +10201,10 @@ nsDocShell::InternalLoad(nsIURI* aURI,
OriginAttributes attrs = GetOriginAttributes();
attrs.SetFirstPartyDomain(isTopLevelDoc, aURI);
net::PredictorLearn(aURI, nullptr,
nsINetworkPredictor::LEARN_LOAD_TOPLEVEL, attrs);
net::PredictorPredict(aURI, nullptr,
nsINetworkPredictor::PREDICT_LOAD, attrs, nullptr);
PredictorLearn(aURI, nullptr,
nsINetworkPredictor::LEARN_LOAD_TOPLEVEL, attrs);
PredictorPredict(aURI, nullptr,
nsINetworkPredictor::PREDICT_LOAD, attrs, nullptr);
nsCOMPtr<nsIRequest> req;
rv = DoURILoad(aURI, aOriginalURI, aResultPrincipalURI, aLoadReplace,
@ -10642,7 +10641,7 @@ nsDocShell::DoURILoad(nsIURI* aURI,
getter_AddRefs(resultPrincipal));
NS_ENSURE_SUCCESS(rv, rv);
if (IsConsideredSameOriginForUIR(aTriggeringPrincipal, resultPrincipal)) {
static_cast<mozilla::LoadInfo*>(loadInfo.get())->SetUpgradeInsecureRequests();
static_cast<LoadInfo*>(loadInfo.get())->SetUpgradeInsecureRequests();
}
}
}
@ -11973,7 +11972,7 @@ nsDocShell::AddToSessionHistory(nsIURI* aURI, nsIChannel* aChannel,
nsCOMPtr<nsIURI> resultPrincipalURI;
bool loadReplace = false;
nsCOMPtr<nsIURI> referrerURI;
uint32_t referrerPolicy = mozilla::net::RP_Unset;
uint32_t referrerPolicy = RP_Unset;
uint32_t cacheKey = 0;
nsCOMPtr<nsIPrincipal> triggeringPrincipal = aTriggeringPrincipal;
nsCOMPtr<nsIPrincipal> principalToInherit = aPrincipalToInherit;
@ -13517,8 +13516,9 @@ nsDocShell::OnLinkClickSync(nsIContent* aContent,
// if per element referrer is enabled, the element referrer overrules
// the document wide referrer
if (IsElementAnchorOrArea(aContent)) {
net::ReferrerPolicy refPolEnum = aContent->AsElement()->GetReferrerPolicyAsEnum();
if (refPolEnum != net::RP_Unset) {
net::ReferrerPolicy refPolEnum =
aContent->AsElement()->GetReferrerPolicyAsEnum();
if (refPolEnum != RP_Unset) {
refererPolicy = refPolEnum;
}
}
@ -13618,10 +13618,10 @@ nsDocShell::OnOverLink(nsIContent* aContent,
NS_ConvertUTF8toUTF16 uStr(spec);
mozilla::net::PredictorPredict(aURI, mCurrentURI,
nsINetworkPredictor::PREDICT_LINK,
aContent->NodePrincipal()->OriginAttributesRef(),
nullptr);
PredictorPredict(aURI, mCurrentURI,
nsINetworkPredictor::PREDICT_LINK,
aContent->NodePrincipal()->OriginAttributesRef(),
nullptr);
if (browserChrome2) {
rv = browserChrome2->SetStatusWithContext(nsIWebBrowserChrome::STATUS_LINK,

10
dom/base/nsContentUtils.cpp
Просмотреть файл

@ -3476,11 +3476,11 @@ nsContentUtils::CanLoadImage(nsIURI* aURI, nsINode* aNode,
}
nsCOMPtr<nsILoadInfo> secCheckLoadInfo =
new LoadInfo(aLoadingPrincipal,
aLoadingPrincipal, // triggering principal
aNode,
nsILoadInfo::SEC_ONLY_FOR_EXPLICIT_CONTENTSEC_CHECK,
nsIContentPolicy::TYPE_INTERNAL_IMAGE);
new mozilla::net::LoadInfo(aLoadingPrincipal,
aLoadingPrincipal, // triggering principal
aNode,
nsILoadInfo::SEC_ONLY_FOR_EXPLICIT_CONTENTSEC_CHECK,
nsIContentPolicy::TYPE_INTERNAL_IMAGE);
int16_t decision = nsIContentPolicy::ACCEPT;

8
dom/base/nsDocument.cpp
Просмотреть файл

@ -3754,7 +3754,7 @@ nsIDocument::SetHeaderData(nsAtom* aHeaderField, const nsAString& aData)
// Referrer policy spec says to ignore any empty referrer policies.
if (aHeaderField == nsGkAtoms::referrer && !aData.IsEmpty()) {
enum ReferrerPolicy policy = mozilla::net::ReferrerPolicyFromString(aData);
enum mozilla::net::ReferrerPolicy policy = mozilla::net::ReferrerPolicyFromString(aData);
// If policy is not the empty string, then set element's node document's
// referrer policy to policy
if (policy != mozilla::net::RP_Unset) {
@ -3766,7 +3766,7 @@ nsIDocument::SetHeaderData(nsAtom* aHeaderField, const nsAString& aData)
}
if (aHeaderField == nsGkAtoms::headerReferrerPolicy && !aData.IsEmpty()) {
enum ReferrerPolicy policy = nsContentUtils::GetReferrerPolicyFromHeader(aData);
enum mozilla::net::ReferrerPolicy policy = nsContentUtils::GetReferrerPolicyFromHeader(aData);
if (policy != mozilla::net::RP_Unset) {
mReferrerPolicy = policy;
mReferrerPolicySet = true;
@ -8961,7 +8961,7 @@ nsIDocument::ResolvePreloadImage(nsIURI *aBaseURI,
void
nsIDocument::MaybePreLoadImage(nsIURI* uri,
const nsAString &aCrossOriginAttr,
enum ReferrerPolicy aReferrerPolicy,
enum mozilla::net::ReferrerPolicy aReferrerPolicy,
bool aIsImgSet)
{
// Early exit if the img is already present in the img-cache
@ -9108,7 +9108,7 @@ void
nsIDocument::PreloadStyle(nsIURI* uri,
const Encoding* aEncoding,
const nsAString& aCrossOriginAttr,
const enum ReferrerPolicy aReferrerPolicy,
const enum mozilla::net::ReferrerPolicy aReferrerPolicy,
const nsAString& aIntegrity)
{
// The CSSLoader will retain this object after we return.

2
dom/network/TCPSocketParent.cpp
Просмотреть файл

@ -41,6 +41,8 @@ extern LazyLogModule gTCPSocketLog;
#define TCPSOCKET_LOG_ENABLED() MOZ_LOG_TEST(gTCPSocketLog, LogLevel::Debug)
} // namespace net
using namespace net;
namespace dom {
static void

3
dom/network/UDPSocketParent.cpp
Просмотреть файл

@ -20,6 +20,9 @@
#include "mtransport/runnable_utils.h"
namespace mozilla {
using namespace net;
namespace dom {
NS_IMPL_ISUPPORTS(UDPSocketParent, nsIUDPSocketListener)

2
dom/security/nsMixedContentBlocker.cpp
Просмотреть файл

@ -275,7 +275,7 @@ nsMixedContentBlocker::AsyncOnChannelRedirect(nsIChannel* aOldChannel,
uint32_t aFlags,
nsIAsyncVerifyRedirectCallback* aCallback)
{
nsAsyncRedirectAutoCallback autoCallback(aCallback);
mozilla::net::nsAsyncRedirectAutoCallback autoCallback(aCallback);
if (!aOldChannel) {
NS_ERROR("No channel when evaluating mixed content!");

10
dom/serviceworkers/ServiceWorkerContainer.cpp
Просмотреть файл

@ -301,11 +301,11 @@ ServiceWorkerContainer::Register(const nsAString& aScriptURL,
// using the ClientInfo instead of doing a window-specific check here.
// See bug 1455077 for further investigation.
nsCOMPtr<nsILoadInfo> secCheckLoadInfo =
new LoadInfo(doc->NodePrincipal(), // loading principal
doc->NodePrincipal(), // triggering principal
doc, // loading node
nsILoadInfo::SEC_ONLY_FOR_EXPLICIT_CONTENTSEC_CHECK,
nsIContentPolicy::TYPE_INTERNAL_SERVICE_WORKER);
new mozilla::net::LoadInfo(doc->NodePrincipal(), // loading principal
doc->NodePrincipal(), // triggering principal
doc, // loading node
nsILoadInfo::SEC_ONLY_FOR_EXPLICIT_CONTENTSEC_CHECK,
nsIContentPolicy::TYPE_INTERNAL_SERVICE_WORKER);
// Check content policy.
int16_t decision = nsIContentPolicy::ACCEPT;

2
dom/serviceworkers/ServiceWorkerEvents.cpp
Просмотреть файл

@ -337,7 +337,7 @@ public:
mChannel->SynthesizeHeader(entries[i].mName, entries[i].mValue);
}
auto castLoadInfo = static_cast<LoadInfo*>(loadInfo.get());
auto castLoadInfo = static_cast<mozilla::net::LoadInfo*>(loadInfo.get());
castLoadInfo->SynthesizeServiceWorkerTainting(mInternalResponse->GetTainting());
// Get the preferred alternative data type of outter channel

4
dom/serviceworkers/ServiceWorkerRegistrar.cpp
Просмотреть файл

@ -63,8 +63,8 @@ StaticRefPtr<ServiceWorkerRegistrar> gServiceWorkerRegistrar;
nsresult
GetOrigin(const nsACString& aURL, nsACString& aOrigin)
{
RefPtr<MozURL> url;
nsresult rv = MozURL::Init(getter_AddRefs(url), aURL);
RefPtr<net::MozURL> url;
nsresult rv = net::MozURL::Init(getter_AddRefs(url), aURL);
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
}

2
dom/workers/ScriptLoader.cpp
Просмотреть файл

@ -161,7 +161,7 @@ ChannelFromScriptURL(nsIPrincipal* principal,
rv = uri->SchemeIs("data", &isData);
NS_ENSURE_SUCCESS(rv, rv);
bool isURIUniqueOrigin = nsIOService::IsDataURIUniqueOpaqueOrigin() && isData;
bool isURIUniqueOrigin = net::nsIOService::IsDataURIUniqueOpaqueOrigin() && isData;
if (inheritAttrs && !isURIUniqueOrigin) {
secFlags |= nsILoadInfo::SEC_FORCE_INHERIT_PRINCIPAL;
}

14
ipc/glue/BackgroundUtils.h
Просмотреть файл

@ -54,8 +54,6 @@ class ParentLoadInfoForwarderArgs;
class RedirectHistoryEntryInfo;
} // namespace net
using namespace mozilla::net;
namespace ipc {
class PrincipalInfo;
@ -90,7 +88,7 @@ IsPincipalInfoPrivate(const PrincipalInfo& aPrincipalInfo);
*/
already_AddRefed<nsIRedirectHistoryEntry>
RHEntryInfoToRHEntry(const RedirectHistoryEntryInfo& aRHEntryInfo);
RHEntryInfoToRHEntry(const mozilla::net::RedirectHistoryEntryInfo& aRHEntryInfo);
/**
* Convert an nsIRedirectHistoryEntry to a RedirectHistoryEntryInfo.
@ -98,20 +96,20 @@ RHEntryInfoToRHEntry(const RedirectHistoryEntryInfo& aRHEntryInfo);
nsresult
RHEntryToRHEntryInfo(nsIRedirectHistoryEntry* aRHEntry,
RedirectHistoryEntryInfo* aRHEntryInfo);
mozilla::net::RedirectHistoryEntryInfo* aRHEntryInfo);
/**
* Convert a LoadInfo to LoadInfoArgs struct.
*/
nsresult
LoadInfoToLoadInfoArgs(nsILoadInfo *aLoadInfo,
OptionalLoadInfoArgs* outOptionalLoadInfoArgs);
mozilla::net::OptionalLoadInfoArgs* outOptionalLoadInfoArgs);
/**
* Convert LoadInfoArgs to a LoadInfo.
*/
nsresult
LoadInfoArgsToLoadInfo(const OptionalLoadInfoArgs& aOptionalLoadInfoArgs,
LoadInfoArgsToLoadInfo(const mozilla::net::OptionalLoadInfoArgs& aOptionalLoadInfoArgs,
nsILoadInfo** outLoadInfo);
/**
@ -119,14 +117,14 @@ LoadInfoArgsToLoadInfo(const OptionalLoadInfoArgs& aOptionalLoadInfoArgs,
*/
void
LoadInfoToParentLoadInfoForwarder(nsILoadInfo *aLoadInfo,
ParentLoadInfoForwarderArgs* outLoadInfoChildForwardArgs);
mozilla::net::ParentLoadInfoForwarderArgs* outLoadInfoChildForwardArgs);
/**
* Merges (replaces) properties of an existing LoadInfo on a child process
* with properties carried down through ParentLoadInfoForwarderArgs.
*/
nsresult
MergeParentLoadInfoForwarder(ParentLoadInfoForwarderArgs const& outLoadInfoChildForwardArgs,
MergeParentLoadInfoForwarder(mozilla::net::ParentLoadInfoForwarderArgs const& outLoadInfoChildForwardArgs,
nsILoadInfo *aLoadInfo);
} // namespace ipc

2
ipc/glue/URIUtils.cpp
Просмотреть файл

@ -105,7 +105,7 @@ DeserializeURI(const URIParams& aParams)
break;
case URIParams::TSimpleNestedURIParams:
mutator = new nsSimpleNestedURI::Mutator();
mutator = new net::nsSimpleNestedURI::Mutator();
break;
case URIParams::THostObjectURIParams:

4
layout/build/nsLayoutModule.cpp
Просмотреть файл

@ -162,12 +162,10 @@ static void Shutdown();
using namespace mozilla;
using namespace mozilla::dom;
using namespace mozilla::net;
using mozilla::dom::power::PowerManagerService;
using mozilla::dom::quota::QuotaManagerService;
using mozilla::dom::WorkerDebuggerManager;
using mozilla::dom::UDPSocketChild;
using mozilla::gmp::GeckoMediaPluginService;
using mozilla::dom::NotificationTelemetryService;
#define NS_EDITORCOMMANDTABLE_CID \
{ 0x4f5e62b8, 0xd659, 0x4156, \

2
media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.cpp
Просмотреть файл

@ -169,7 +169,7 @@ PeerConnectionMedia::InitLocalAddrs()
// We're in the content process, so send a request over IPC for the
// stun address discovery.
mStunAddrsRequest =
new StunAddrsRequestChild(new StunAddrsHandler(this), target);
new net::StunAddrsRequestChild(new StunAddrsHandler(this), target);
mStunAddrsRequest->SendGetStunAddrs();
} else {
// No content process, so don't need to hold up the ice event queue

1
netwerk/base/nsAsyncStreamCopier.cpp
Просмотреть файл

@ -14,6 +14,7 @@
#include "mozilla/Logging.h"
using namespace mozilla;
using namespace mozilla::net;
#undef LOG
//

2
netwerk/base/nsBaseChannel.cpp
Просмотреть файл

@ -91,7 +91,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<mozilla::net::LoadInfo*>(mLoadInfo.get())->CloneWithNewSecFlags(secFlags);
nsCOMPtr<nsIPrincipal> uriPrincipal;
nsIScriptSecurityManager *sm = nsContentUtils::GetSecurityManager();

1
netwerk/base/nsIncrementalDownload.cpp
Просмотреть файл

@ -40,6 +40,7 @@
#define MAX_RETRY_COUNT 20
using namespace mozilla;
using namespace mozilla::net;
//-----------------------------------------------------------------------------

2
netwerk/base/nsInputStreamPump.cpp
Просмотреть файл

@ -112,7 +112,7 @@ nsInputStreamPump::PeekStream(PeekSegmentFun callback, void* closure)
PeekData data(callback, closure);
return mAsyncStream->ReadSegments(CallPeekFunc,
&data,
nsIOService::gDefaultSegmentSize,
net::nsIOService::gDefaultSegmentSize,
&dummy);
}

15
netwerk/base/nsNetUtil.cpp
Просмотреть файл

@ -767,11 +767,11 @@ NS_NewInputStreamChannelInternal(nsIChannel** outChannel,
nsContentPolicyType aContentPolicyType)
{
nsCOMPtr<nsILoadInfo> loadInfo =
new mozilla::LoadInfo(aLoadingPrincipal,
aTriggeringPrincipal,
aLoadingNode,
aSecurityFlags,
aContentPolicyType);
new mozilla::net::LoadInfo(aLoadingPrincipal,
aTriggeringPrincipal,
aLoadingNode,
aSecurityFlags,
aContentPolicyType);
if (!loadInfo) {
return NS_ERROR_UNEXPECTED;
}
@ -858,8 +858,9 @@ NS_NewInputStreamChannelInternal(nsIChannel **outChannel,
bool aIsSrcdocChannel /* = false */)
{
nsCOMPtr<nsILoadInfo> loadInfo =
new mozilla::LoadInfo(aLoadingPrincipal, aTriggeringPrincipal,
aLoadingNode, aSecurityFlags, aContentPolicyType);
new mozilla::net::LoadInfo(aLoadingPrincipal, aTriggeringPrincipal,
aLoadingNode, aSecurityFlags,
aContentPolicyType);
return NS_NewInputStreamChannelInternal(outChannel, aUri, aData, aContentType,
loadInfo, aIsSrcdocChannel);
}

2
netwerk/base/nsStandardURL.cpp
Просмотреть файл

@ -3685,5 +3685,5 @@ nsStandardURL::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const {
nsresult
Test_NormalizeIPv4(const nsACString& host, nsCString& result)
{
return nsStandardURL::NormalizeIPv4(host, result);
return mozilla::net::nsStandardURL::NormalizeIPv4(host, result);
}

1
netwerk/build/nsNetModule.cpp
Просмотреть файл

@ -293,6 +293,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(NamedPipeService, Init)
#include "nsResProtocolHandler.h"
#include "ExtensionProtocolHandler.h"
#include "SubstitutingProtocolHandler.h"
typedef mozilla::net::ExtensionProtocolHandler ExtensionProtocolHandler;
typedef mozilla::net::SubstitutingURL::Mutator SubstitutingURLMutator;
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsResProtocolHandler, Init)

2
netwerk/cookie/nsCookieService.cpp
Просмотреть файл

@ -3513,7 +3513,7 @@ nsCookieService::CanSetCookie(nsIURI* aHostURI,
// to be processed
bool
nsCookieService::SetCookieInternal(nsIURI *aHostURI,
const mozilla::nsCookieKey &aKey,
const mozilla::net::nsCookieKey &aKey,
bool aRequireHostMatch,
CookieStatus aStatus,
nsDependentCString &aCookieHeader,

2
netwerk/protocol/data/nsDataChannel.cpp
Просмотреть файл

@ -91,7 +91,7 @@ nsDataChannel::OpenContentStream(bool async, nsIInputStream **result,
// create an unbounded pipe.
rv = NS_NewPipe(getter_AddRefs(bufInStream),
getter_AddRefs(bufOutStream),
nsIOService::gDefaultSegmentSize,
net::nsIOService::gDefaultSegmentSize,
UINT32_MAX,
async, true);
if (NS_FAILED(rv))

2
netwerk/protocol/data/nsDataHandler.cpp
Просмотреть файл

@ -87,7 +87,7 @@ nsDataHandler::NewURI(const nsACString &aSpec,
}
}
rv = NS_MutateURI(new nsSimpleURI::Mutator())
rv = NS_MutateURI(new mozilla::net::nsSimpleURI::Mutator())
.SetSpec(spec)
.Finalize(uri);
}

2
netwerk/protocol/http/HttpBaseChannel.cpp
Просмотреть файл

@ -3268,7 +3268,7 @@ HttpBaseChannel::CloneLoadInfoForRedirect(nsIURI * newURI, uint32_t redirectFlag
}
nsCOMPtr<nsILoadInfo> newLoadInfo =
static_cast<mozilla::LoadInfo*>(mLoadInfo.get())->Clone();
static_cast<mozilla::net::LoadInfo*>(mLoadInfo.get())->Clone();
nsContentPolicyType contentPolicyType = mLoadInfo->GetExternalContentPolicyType();
if (contentPolicyType == nsIContentPolicy::TYPE_DOCUMENT ||

5
netwerk/protocol/http/nsCORSListenerProxy.cpp
Просмотреть файл

@ -48,6 +48,7 @@
#include <algorithm>
using namespace mozilla;
using namespace mozilla::net;
#define PREFLIGHT_CACHE_SIZE 100
@ -1490,9 +1491,9 @@ nsCORSListenerProxy::StartCORSPreflight(nsIChannel* aRequestChannel,
// Either it wasn't cached or the cached result has expired. Build a
// channel for the OPTIONS request.
nsCOMPtr<nsILoadInfo> loadInfo = static_cast<mozilla::LoadInfo*>
nsCOMPtr<nsILoadInfo> loadInfo = static_cast<mozilla::net::LoadInfo*>
(originalLoadInfo.get())->CloneForNewRequest();
static_cast<mozilla::LoadInfo*>(loadInfo.get())->SetIsPreflight();
static_cast<mozilla::net::LoadInfo*>(loadInfo.get())->SetIsPreflight();
nsCOMPtr<nsILoadGroup> loadGroup;
rv = aRequestChannel->GetLoadGroup(getter_AddRefs(loadGroup));

2
netwerk/protocol/http/nsIHttpChannelChild.idl
Просмотреть файл

@ -6,7 +6,7 @@
#include "nsISupports.idl"
[ptr] native RequestHeaderTuples(mozilla::net::RequestHeaderTuples);
[ref] native OptionalCorsPreflightArgsRef(mozilla::OptionalCorsPreflightArgs);
[ref] native OptionalCorsPreflightArgsRef(mozilla::net::OptionalCorsPreflightArgs);
interface nsIPrincipal;
interface nsIURI;

18
netwerk/protocol/res/nsResProtocolHandler.h
Просмотреть файл

@ -17,18 +17,18 @@ class nsISubstitutionObserver;
struct SubstitutionMapping;
class nsResProtocolHandler final : public nsIResProtocolHandler,
public mozilla::SubstitutingProtocolHandler,
public mozilla::net::SubstitutingProtocolHandler,
public nsSupportsWeakReference
{
public:
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_NSIRESPROTOCOLHANDLER
NS_FORWARD_NSIPROTOCOLHANDLER(mozilla::SubstitutingProtocolHandler::)
NS_FORWARD_NSIPROTOCOLHANDLER(mozilla::net::SubstitutingProtocolHandler::)
nsResProtocolHandler()
: SubstitutingProtocolHandler("resource", URI_STD | URI_IS_UI_RESOURCE | URI_IS_LOCAL_RESOURCE,
/* aEnforceFileOrJar = */ false)
: mozilla::net::SubstitutingProtocolHandler("resource", URI_STD | URI_IS_UI_RESOURCE | URI_IS_LOCAL_RESOURCE,
/* aEnforceFileOrJar = */ false)
{}
MOZ_MUST_USE nsresult Init();
@ -38,27 +38,27 @@ public:
NS_IMETHOD GetSubstitution(const nsACString& aRoot, nsIURI** aResult) override
{
return mozilla::SubstitutingProtocolHandler::GetSubstitution(aRoot, aResult);
return mozilla::net::SubstitutingProtocolHandler::GetSubstitution(aRoot, aResult);
}
NS_IMETHOD HasSubstitution(const nsACString& aRoot, bool* aResult) override
{
return mozilla::SubstitutingProtocolHandler::HasSubstitution(aRoot, aResult);
return mozilla::net::SubstitutingProtocolHandler::HasSubstitution(aRoot, aResult);
}
NS_IMETHOD ResolveURI(nsIURI *aResURI, nsACString& aResult) override
{
return mozilla::SubstitutingProtocolHandler::ResolveURI(aResURI, aResult);
return mozilla::net::SubstitutingProtocolHandler::ResolveURI(aResURI, aResult);
}
NS_IMETHOD AddObserver(nsISubstitutionObserver *aObserver) override
{
return mozilla::SubstitutingProtocolHandler::AddObserver(aObserver);
return mozilla::net::SubstitutingProtocolHandler::AddObserver(aObserver);
}
NS_IMETHOD RemoveObserver(nsISubstitutionObserver *aObserver) override
{
return mozilla::SubstitutingProtocolHandler::RemoveObserver(aObserver);
return mozilla::net::SubstitutingProtocolHandler::RemoveObserver(aObserver);
}
protected:

2
security/manager/ssl/PSMContentListener.cpp
Просмотреть файл

@ -271,7 +271,7 @@ PSMContentDownloaderParent::RecvDivertToParentUsing(mozilla::net::PChannelDivert
MOZ_ASSERT(diverter);
auto p = static_cast<mozilla::net::ChannelDiverterParent*>(diverter);
p->DivertTo(this);
mozilla::Unused << ChannelDiverterParent::Send__delete__(p);
mozilla::Unused << mozilla::net::ChannelDiverterParent::Send__delete__(p);
return IPC_OK();
}

4
toolkit/components/extensions/webrequest/StreamFilterParent.cpp
Просмотреть файл

@ -137,7 +137,7 @@ StreamFilterParent::Create(dom::ContentParent* aContentParent, uint64_t aChannel
RefPtr<nsAtom> addonId = NS_Atomize(aAddonId);
nsCOMPtr<nsITraceableChannel> channel = webreq.GetTraceableChannel(aChannelId, addonId, aContentParent);
RefPtr<nsHttpChannel> chan = do_QueryObject(channel);
RefPtr<mozilla::net::nsHttpChannel> chan = do_QueryObject(channel);
NS_ENSURE_TRUE(chan, false);
auto channelPid = chan->ProcessId();
@ -693,7 +693,7 @@ StreamFilterParent::FlushBufferedData()
nsIEventTarget*
StreamFilterParent::ActorThread()
{
return gSocketTransportService;
return net::gSocketTransportService;
}
bool

14
toolkit/components/places/nsFaviconService.cpp
Просмотреть файл

@ -549,13 +549,13 @@ nsFaviconService::ReplaceFaviconDataFromDataURL(nsIURI* aFaviconURI,
NS_ENSURE_TRUE(loadingPrincipal, NS_ERROR_FAILURE);
nsCOMPtr<nsILoadInfo> loadInfo =
new mozilla::LoadInfo(loadingPrincipal,
nullptr, // aTriggeringPrincipal
nullptr, // aLoadingNode
nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_INHERITS |
nsILoadInfo::SEC_ALLOW_CHROME |
nsILoadInfo::SEC_DISALLOW_SCRIPT,
nsIContentPolicy::TYPE_INTERNAL_IMAGE_FAVICON);
new mozilla::net::LoadInfo(loadingPrincipal,
nullptr, // aTriggeringPrincipal
nullptr, // aLoadingNode
nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_INHERITS |
nsILoadInfo::SEC_ALLOW_CHROME |
nsILoadInfo::SEC_DISALLOW_SCRIPT,
nsIContentPolicy::TYPE_INTERNAL_IMAGE_FAVICON);
nsCOMPtr<nsIChannel> channel;
rv = protocolHandler->NewChannel2(dataURI, loadInfo, getter_AddRefs(channel));

2
uriloader/exthandler/ExternalHelperAppParent.cpp
Просмотреть файл

@ -196,7 +196,7 @@ ExternalHelperAppParent::RecvDivertToParentUsing(PChannelDiverterParent* diverte
#ifdef DEBUG
mDiverted = true;
#endif
Unused << ChannelDiverterParent::Send__delete__(p);
Unused << mozilla::net::ChannelDiverterParent::Send__delete__(p);
return IPC_OK();
}

2
uriloader/exthandler/nsExternalProtocolHandler.cpp
Просмотреть файл

@ -405,7 +405,7 @@ NS_IMETHODIMP nsExtProtocolChannel::CompleteRedirectSetup(nsIStreamListener *lis
// From nsIParentChannel (derives from nsIStreamListener)
//////////////////////////////////////////////////////////////////////
NS_IMETHODIMP nsExtProtocolChannel::SetParentListener(HttpChannelParentListener* aListener)
NS_IMETHODIMP nsExtProtocolChannel::SetParentListener(mozilla::net::HttpChannelParentListener* aListener)
{
// This is called as part of the connect parent operation from
// ContentParent::RecvExtProtocolChannelConnectParent. Setting