mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 11:25:00 +00:00
7ed406b2be
--- netwerk/base/ARefBase.h | 2 ++ netwerk/base/CaptivePortalService.cpp | 1 + netwerk/base/CaptivePortalService.h | 1 + netwerk/base/EventTokenBucket.cpp | 4 +++- netwerk/base/LoadContextInfo.cpp | 3 +++ netwerk/base/LoadInfo.cpp | 3 +++ netwerk/base/MemoryDownloader.cpp | 1 + netwerk/base/Predictor.cpp | 1 + netwerk/base/RedirectChannelRegistrar.h | 1 + netwerk/base/nsBaseChannel.cpp | 1 + netwerk/base/nsChannelClassifier.cpp | 1 + netwerk/base/nsDirectoryIndexStream.cpp | 3 ++- netwerk/base/nsDownloader.cpp | 1 + netwerk/base/nsIOService.cpp | 1 + netwerk/base/nsIncrementalDownload.cpp | 3 +++ netwerk/base/nsNetUtil.cpp | 4 ++++ netwerk/base/nsNetUtil.h | 1 + netwerk/base/nsProtocolProxyService.cpp | 1 + netwerk/base/nsSecCheckWrapChannel.cpp | 2 ++ netwerk/base/nsUDPSocket.cpp | 4 +++- netwerk/cache/nsDiskCacheBinding.cpp | 2 +- netwerk/cache/nsDiskCacheDeviceSQL.cpp | 2 ++ netwerk/cache/nsMemoryCacheDevice.cpp | 2 +- netwerk/cache2/CacheFileUtils.cpp | 2 ++ netwerk/cache2/CacheStorageService.h | 1 + netwerk/ipc/NeckoParent.cpp | 1 + netwerk/ipc/RemoteOpenFileChild.cpp | 1 + netwerk/protocol/about/nsAboutBloat.cpp | 1 + netwerk/protocol/about/nsAboutCacheEntry.cpp | 1 + netwerk/protocol/about/nsAboutProtocolHandler.cpp | 1 + netwerk/protocol/data/DataChannelParent.cpp | 1 + netwerk/protocol/file/nsFileProtocolHandler.cpp | 1 + netwerk/protocol/ftp/FTPChannelParent.cpp | 2 ++ netwerk/protocol/ftp/FTPChannelParent.h | 1 + netwerk/protocol/ftp/nsFtpConnectionThread.cpp | 1 + netwerk/protocol/ftp/nsFtpProtocolHandler.h | 1 + netwerk/protocol/http/Http2Compression.cpp | 1 + netwerk/protocol/http/Http2Session.cpp | 1 + netwerk/protocol/http/Http2Stream.h | 2 ++ netwerk/protocol/http/HttpBaseChannel.cpp | 4 ++++ netwerk/protocol/http/HttpBaseChannel.h | 1 + netwerk/protocol/http/HttpChannelChild.cpp | 25 ++-------------------- netwerk/protocol/http/HttpChannelChild.h | 24 +++++++++++++++++++++ netwerk/protocol/http/HttpChannelParent.cpp | 1 + netwerk/protocol/http/HttpChannelParent.h | 1 + .../protocol/http/HttpChannelParentListener.cpp | 1 + netwerk/protocol/http/HttpChannelParentListener.h | 1 + netwerk/protocol/http/InterceptedChannel.cpp | 1 + netwerk/protocol/http/NullHttpChannel.cpp | 1 + netwerk/protocol/http/NullHttpTransaction.cpp | 1 + netwerk/protocol/http/PackagedAppService.cpp | 14 ++++++++++-- netwerk/protocol/http/PackagedAppService.h | 4 +++- netwerk/protocol/http/PackagedAppVerifier.cpp | 1 + netwerk/protocol/http/nsCORSListenerProxy.cpp | 2 +- netwerk/protocol/http/nsHttpBasicAuth.cpp | 1 + netwerk/protocol/http/nsHttpChannel.cpp | 2 ++ netwerk/protocol/http/nsHttpChunkedDecoder.cpp | 1 + netwerk/protocol/http/nsHttpConnectionInfo.cpp | 2 ++ netwerk/protocol/http/nsHttpConnectionMgr.cpp | 1 + netwerk/protocol/http/nsHttpDigestAuth.cpp | 1 + netwerk/protocol/viewsource/nsViewSourceHandler.h | 4 ++++ .../protocol/websocket/BaseWebSocketChannel.cpp | 1 + .../websocket/WebSocketEventListenerParent.cpp | 1 + .../protocol/websocket/WebSocketEventService.cpp | 3 +++ netwerk/protocol/websocket/WebSocketFrame.cpp | 2 ++ netwerk/protocol/wyciwyg/nsWyciwygChannel.cpp | 1 + .../protocol/wyciwyg/nsWyciwygProtocolHandler.cpp | 1 + netwerk/streamconv/converters/mozTXTToHTMLConv.cpp | 1 + .../streamconv/converters/nsFTPDirListingConv.cpp | 1 + .../streamconv/converters/nsHTTPCompressConv.cpp | 2 ++ netwerk/streamconv/converters/nsHTTPCompressConv.h | 1 + netwerk/streamconv/converters/nsIndexedToHTML.cpp | 1 + netwerk/streamconv/converters/nsMultiMixedConv.cpp | 2 ++ netwerk/streamconv/converters/nsTXTToHTMLConv.cpp | 2 ++ netwerk/streamconv/converters/nsUnknownDecoder.cpp | 2 ++ 75 files changed, 147 insertions(+), 32 deletions(-)
182 lines
5.0 KiB
C++
182 lines
5.0 KiB
C++
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "LoadContextInfo.h"
|
|
|
|
#include "mozilla/dom/ToJSValue.h"
|
|
#include "nsIChannel.h"
|
|
#include "nsILoadContext.h"
|
|
#include "nsIWebNavigation.h"
|
|
#include "nsNetUtil.h"
|
|
|
|
using namespace mozilla::dom;
|
|
namespace mozilla {
|
|
namespace net {
|
|
|
|
// LoadContextInfo
|
|
|
|
NS_IMPL_ISUPPORTS(LoadContextInfo, nsILoadContextInfo)
|
|
|
|
LoadContextInfo::LoadContextInfo(bool aIsPrivate, bool aIsAnonymous, NeckoOriginAttributes aOriginAttributes)
|
|
: mIsPrivate(aIsPrivate)
|
|
, mIsAnonymous(aIsAnonymous)
|
|
, mOriginAttributes(aOriginAttributes)
|
|
{
|
|
}
|
|
|
|
LoadContextInfo::~LoadContextInfo()
|
|
{
|
|
}
|
|
|
|
NS_IMETHODIMP LoadContextInfo::GetIsPrivate(bool *aIsPrivate)
|
|
{
|
|
*aIsPrivate = mIsPrivate;
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP LoadContextInfo::GetIsAnonymous(bool *aIsAnonymous)
|
|
{
|
|
*aIsAnonymous = mIsAnonymous;
|
|
return NS_OK;
|
|
}
|
|
|
|
NeckoOriginAttributes const* LoadContextInfo::OriginAttributesPtr()
|
|
{
|
|
return &mOriginAttributes;
|
|
}
|
|
|
|
NS_IMETHODIMP LoadContextInfo::GetOriginAttributes(JSContext *aCx,
|
|
JS::MutableHandle<JS::Value> aVal)
|
|
{
|
|
if (NS_WARN_IF(!ToJSValue(aCx, mOriginAttributes, aVal))) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
return NS_OK;
|
|
}
|
|
|
|
// LoadContextInfoFactory
|
|
|
|
NS_IMPL_ISUPPORTS(LoadContextInfoFactory, nsILoadContextInfoFactory)
|
|
|
|
NS_IMETHODIMP LoadContextInfoFactory::GetDefault(nsILoadContextInfo * *aDefault)
|
|
{
|
|
nsCOMPtr<nsILoadContextInfo> info = GetLoadContextInfo(false, false, NeckoOriginAttributes());
|
|
info.forget(aDefault);
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP LoadContextInfoFactory::GetPrivate(nsILoadContextInfo * *aPrivate)
|
|
{
|
|
nsCOMPtr<nsILoadContextInfo> info = GetLoadContextInfo(true, false, NeckoOriginAttributes());
|
|
info.forget(aPrivate);
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP LoadContextInfoFactory::GetAnonymous(nsILoadContextInfo * *aAnonymous)
|
|
{
|
|
nsCOMPtr<nsILoadContextInfo> info = GetLoadContextInfo(false, true, NeckoOriginAttributes());
|
|
info.forget(aAnonymous);
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP LoadContextInfoFactory::Custom(bool aPrivate, bool aAnonymous,
|
|
JS::HandleValue aOriginAttributes, JSContext *cx,
|
|
nsILoadContextInfo * *_retval)
|
|
{
|
|
NeckoOriginAttributes attrs;
|
|
bool status = attrs.Init(cx, aOriginAttributes);
|
|
NS_ENSURE_TRUE(status, NS_ERROR_FAILURE);
|
|
|
|
nsCOMPtr<nsILoadContextInfo> info = GetLoadContextInfo(aPrivate, aAnonymous, attrs);
|
|
info.forget(_retval);
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP LoadContextInfoFactory::FromLoadContext(nsILoadContext *aLoadContext, bool aAnonymous,
|
|
nsILoadContextInfo * *_retval)
|
|
{
|
|
nsCOMPtr<nsILoadContextInfo> info = GetLoadContextInfo(aLoadContext, aAnonymous);
|
|
info.forget(_retval);
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP LoadContextInfoFactory::FromWindow(nsIDOMWindow *aWindow, bool aAnonymous,
|
|
nsILoadContextInfo * *_retval)
|
|
{
|
|
nsCOMPtr<nsILoadContextInfo> info = GetLoadContextInfo(aWindow, aAnonymous);
|
|
info.forget(_retval);
|
|
return NS_OK;
|
|
}
|
|
|
|
// Helper functions
|
|
|
|
LoadContextInfo *
|
|
GetLoadContextInfo(nsIChannel * aChannel)
|
|
{
|
|
nsresult rv;
|
|
|
|
bool pb = NS_UsePrivateBrowsing(aChannel);
|
|
|
|
bool anon = false;
|
|
nsLoadFlags loadFlags;
|
|
rv = aChannel->GetLoadFlags(&loadFlags);
|
|
if (NS_SUCCEEDED(rv)) {
|
|
anon = !!(loadFlags & nsIChannel::LOAD_ANONYMOUS);
|
|
}
|
|
|
|
NeckoOriginAttributes oa;
|
|
NS_GetOriginAttributes(aChannel, oa);
|
|
|
|
return new LoadContextInfo(pb, anon, oa);
|
|
}
|
|
|
|
LoadContextInfo *
|
|
GetLoadContextInfo(nsILoadContext *aLoadContext, bool aIsAnonymous)
|
|
{
|
|
if (!aLoadContext) {
|
|
return new LoadContextInfo(false, aIsAnonymous,
|
|
NeckoOriginAttributes(nsILoadContextInfo::NO_APP_ID, false));
|
|
}
|
|
|
|
bool pb = aLoadContext->UsePrivateBrowsing();
|
|
DocShellOriginAttributes doa;
|
|
aLoadContext->GetOriginAttributes(doa);
|
|
|
|
NeckoOriginAttributes noa;
|
|
noa.InheritFromDocShellToNecko(doa);
|
|
|
|
return new LoadContextInfo(pb, aIsAnonymous, noa);
|
|
}
|
|
|
|
LoadContextInfo*
|
|
GetLoadContextInfo(nsIDOMWindow *aWindow,
|
|
bool aIsAnonymous)
|
|
{
|
|
nsCOMPtr<nsIWebNavigation> webNav = do_GetInterface(aWindow);
|
|
nsCOMPtr<nsILoadContext> loadContext = do_QueryInterface(webNav);
|
|
|
|
return GetLoadContextInfo(loadContext, aIsAnonymous);
|
|
}
|
|
|
|
LoadContextInfo *
|
|
GetLoadContextInfo(nsILoadContextInfo *aInfo)
|
|
{
|
|
return new LoadContextInfo(aInfo->IsPrivate(),
|
|
aInfo->IsAnonymous(),
|
|
*aInfo->OriginAttributesPtr());
|
|
}
|
|
|
|
LoadContextInfo *
|
|
GetLoadContextInfo(bool const aIsPrivate,
|
|
bool const aIsAnonymous,
|
|
NeckoOriginAttributes const &aOriginAttributes)
|
|
{
|
|
return new LoadContextInfo(aIsPrivate,
|
|
aIsAnonymous,
|
|
aOriginAttributes);
|
|
}
|
|
|
|
} // namespace net
|
|
} // namespace mozilla
|