зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1733356 - Fix non-unified build errors in netwerk/ipc/ r=necko-reviewers,kershaw
Differential Revision: https://phabricator.services.mozilla.com/D127402
This commit is contained in:
Родитель
d3929fec26
Коммит
4db74f9b7c
|
@ -7,7 +7,9 @@
|
||||||
|
|
||||||
#include "DocumentChannelChild.h"
|
#include "DocumentChannelChild.h"
|
||||||
|
|
||||||
|
#include "mozilla/dom/Document.h"
|
||||||
#include "mozilla/extensions/StreamFilterParent.h"
|
#include "mozilla/extensions/StreamFilterParent.h"
|
||||||
|
#include "mozilla/ipc/Endpoint.h"
|
||||||
#include "mozilla/net/HttpBaseChannel.h"
|
#include "mozilla/net/HttpBaseChannel.h"
|
||||||
#include "mozilla/net/NeckoChild.h"
|
#include "mozilla/net/NeckoChild.h"
|
||||||
#include "mozilla/ScopeExit.h"
|
#include "mozilla/ScopeExit.h"
|
||||||
|
@ -20,6 +22,7 @@
|
||||||
#include "nsFrameLoader.h"
|
#include "nsFrameLoader.h"
|
||||||
#include "nsFrameLoaderOwner.h"
|
#include "nsFrameLoaderOwner.h"
|
||||||
#include "nsQueryObject.h"
|
#include "nsQueryObject.h"
|
||||||
|
#include "nsDocShellLoadState.h"
|
||||||
|
|
||||||
using namespace mozilla::dom;
|
using namespace mozilla::dom;
|
||||||
using namespace mozilla::ipc;
|
using namespace mozilla::ipc;
|
||||||
|
|
|
@ -54,6 +54,7 @@
|
||||||
#include "mozilla/dom/BrowserParent.h"
|
#include "mozilla/dom/BrowserParent.h"
|
||||||
#include "mozilla/dom/Element.h"
|
#include "mozilla/dom/Element.h"
|
||||||
#include "mozilla/dom/nsHTTPSOnlyUtils.h"
|
#include "mozilla/dom/nsHTTPSOnlyUtils.h"
|
||||||
|
#include "mozilla/dom/ReferrerInfo.h"
|
||||||
#include "mozilla/dom/RemoteWebProgressRequest.h"
|
#include "mozilla/dom/RemoteWebProgressRequest.h"
|
||||||
#include "mozilla/net/UrlClassifierFeatureFactory.h"
|
#include "mozilla/net/UrlClassifierFeatureFactory.h"
|
||||||
#include "mozilla/ExtensionPolicyService.h"
|
#include "mozilla/ExtensionPolicyService.h"
|
||||||
|
|
|
@ -39,6 +39,7 @@
|
||||||
#include "mozilla/dom/ContentParent.h"
|
#include "mozilla/dom/ContentParent.h"
|
||||||
#include "mozilla/dom/TabContext.h"
|
#include "mozilla/dom/TabContext.h"
|
||||||
#include "mozilla/dom/BrowserParent.h"
|
#include "mozilla/dom/BrowserParent.h"
|
||||||
|
#include "mozilla/dom/MaybeDiscarded.h"
|
||||||
#include "mozilla/dom/network/TCPSocketParent.h"
|
#include "mozilla/dom/network/TCPSocketParent.h"
|
||||||
#include "mozilla/dom/network/TCPServerSocketParent.h"
|
#include "mozilla/dom/network/TCPServerSocketParent.h"
|
||||||
#include "mozilla/dom/network/UDPSocketParent.h"
|
#include "mozilla/dom/network/UDPSocketParent.h"
|
||||||
|
@ -55,6 +56,7 @@
|
||||||
#include "nsISpeculativeConnect.h"
|
#include "nsISpeculativeConnect.h"
|
||||||
#include "nsHttpHandler.h"
|
#include "nsHttpHandler.h"
|
||||||
#include "nsNetUtil.h"
|
#include "nsNetUtil.h"
|
||||||
|
#include "nsIOService.h"
|
||||||
|
|
||||||
using IPC::SerializedLoadContext;
|
using IPC::SerializedLoadContext;
|
||||||
using mozilla::OriginAttributes;
|
using mozilla::OriginAttributes;
|
||||||
|
@ -268,7 +270,7 @@ bool NeckoParent::DeallocPAltDataOutputStreamParent(
|
||||||
|
|
||||||
already_AddRefed<PDocumentChannelParent>
|
already_AddRefed<PDocumentChannelParent>
|
||||||
NeckoParent::AllocPDocumentChannelParent(
|
NeckoParent::AllocPDocumentChannelParent(
|
||||||
const MaybeDiscarded<BrowsingContext>& aContext,
|
const dom::MaybeDiscarded<BrowsingContext>& aContext,
|
||||||
const DocumentChannelCreationArgs& args) {
|
const DocumentChannelCreationArgs& args) {
|
||||||
RefPtr<DocumentChannelParent> p = new DocumentChannelParent();
|
RefPtr<DocumentChannelParent> p = new DocumentChannelParent();
|
||||||
return p.forget();
|
return p.forget();
|
||||||
|
@ -276,7 +278,7 @@ NeckoParent::AllocPDocumentChannelParent(
|
||||||
|
|
||||||
mozilla::ipc::IPCResult NeckoParent::RecvPDocumentChannelConstructor(
|
mozilla::ipc::IPCResult NeckoParent::RecvPDocumentChannelConstructor(
|
||||||
PDocumentChannelParent* aActor,
|
PDocumentChannelParent* aActor,
|
||||||
const MaybeDiscarded<BrowsingContext>& aContext,
|
const dom::MaybeDiscarded<BrowsingContext>& aContext,
|
||||||
const DocumentChannelCreationArgs& aArgs) {
|
const DocumentChannelCreationArgs& aArgs) {
|
||||||
DocumentChannelParent* p = static_cast<DocumentChannelParent*>(aActor);
|
DocumentChannelParent* p = static_cast<DocumentChannelParent*>(aActor);
|
||||||
|
|
||||||
|
@ -542,7 +544,7 @@ mozilla::ipc::IPCResult NeckoParent::RecvSpeculativeConnect(
|
||||||
mozilla::ipc::IPCResult NeckoParent::RecvHTMLDNSPrefetch(
|
mozilla::ipc::IPCResult NeckoParent::RecvHTMLDNSPrefetch(
|
||||||
const nsString& hostname, const bool& isHttps,
|
const nsString& hostname, const bool& isHttps,
|
||||||
const OriginAttributes& aOriginAttributes, const uint32_t& flags) {
|
const OriginAttributes& aOriginAttributes, const uint32_t& flags) {
|
||||||
HTMLDNSPrefetch::Prefetch(hostname, isHttps, aOriginAttributes, flags);
|
dom::HTMLDNSPrefetch::Prefetch(hostname, isHttps, aOriginAttributes, flags);
|
||||||
return IPC_OK();
|
return IPC_OK();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -550,8 +552,8 @@ mozilla::ipc::IPCResult NeckoParent::RecvCancelHTMLDNSPrefetch(
|
||||||
const nsString& hostname, const bool& isHttps,
|
const nsString& hostname, const bool& isHttps,
|
||||||
const OriginAttributes& aOriginAttributes, const uint32_t& flags,
|
const OriginAttributes& aOriginAttributes, const uint32_t& flags,
|
||||||
const nsresult& reason) {
|
const nsresult& reason) {
|
||||||
HTMLDNSPrefetch::CancelPrefetch(hostname, isHttps, aOriginAttributes, flags,
|
dom::HTMLDNSPrefetch::CancelPrefetch(hostname, isHttps, aOriginAttributes,
|
||||||
reason);
|
flags, reason);
|
||||||
return IPC_OK();
|
return IPC_OK();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -6,8 +6,13 @@
|
||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
#include "ParentChannelWrapper.h"
|
#include "ParentChannelWrapper.h"
|
||||||
|
#include "mozilla/net/HttpBaseChannel.h"
|
||||||
#include "mozilla/net/UrlClassifierCommon.h"
|
#include "mozilla/net/UrlClassifierCommon.h"
|
||||||
#include "nsIRedirectChannelRegistrar.h"
|
#include "mozilla/net/RedirectChannelRegistrar.h"
|
||||||
|
#include "nsIViewSourceChannel.h"
|
||||||
|
#include "nsNetUtil.h"
|
||||||
|
#include "nsQueryObject.h"
|
||||||
|
#include "mozilla/dom/RemoteType.h"
|
||||||
|
|
||||||
namespace mozilla {
|
namespace mozilla {
|
||||||
namespace net {
|
namespace net {
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
|
|
||||||
#include "ParentProcessDocumentChannel.h"
|
#include "ParentProcessDocumentChannel.h"
|
||||||
|
|
||||||
|
#include "mozilla/extensions/StreamFilterParent.h"
|
||||||
#include "mozilla/net/ParentChannelWrapper.h"
|
#include "mozilla/net/ParentChannelWrapper.h"
|
||||||
#include "mozilla/net/UrlClassifierCommon.h"
|
#include "mozilla/net/UrlClassifierCommon.h"
|
||||||
#include "mozilla/StaticPrefs_extensions.h"
|
#include "mozilla/StaticPrefs_extensions.h"
|
||||||
|
@ -15,6 +16,8 @@
|
||||||
#include "nsIObserverService.h"
|
#include "nsIObserverService.h"
|
||||||
#include "nsIClassifiedChannel.h"
|
#include "nsIClassifiedChannel.h"
|
||||||
#include "nsIXULRuntime.h"
|
#include "nsIXULRuntime.h"
|
||||||
|
#include "nsHttpHandler.h"
|
||||||
|
#include "nsDocShellLoadState.h"
|
||||||
|
|
||||||
extern mozilla::LazyLogModule gDocumentChannelLog;
|
extern mozilla::LazyLogModule gDocumentChannelLog;
|
||||||
#define LOG(fmt) MOZ_LOG(gDocumentChannelLog, mozilla::LogLevel::Verbose, fmt)
|
#define LOG(fmt) MOZ_LOG(gDocumentChannelLog, mozilla::LogLevel::Verbose, fmt)
|
||||||
|
@ -179,7 +182,7 @@ NS_IMETHODIMP ParentProcessDocumentChannel::AsyncOpen(
|
||||||
mLoadState, mCacheKey, Some(mChannelId), mAsyncOpenTime, mTiming,
|
mLoadState, mCacheKey, Some(mChannelId), mAsyncOpenTime, mTiming,
|
||||||
std::move(initialClientInfo), InnerWindowIDForExtantDoc(docShell),
|
std::move(initialClientInfo), InnerWindowIDForExtantDoc(docShell),
|
||||||
mLoadFlags, mLoadInfo->InternalContentPolicyType(),
|
mLoadFlags, mLoadInfo->InternalContentPolicyType(),
|
||||||
UserActivation::IsHandlingUserInput(), nullptr /* ContentParent */,
|
dom::UserActivation::IsHandlingUserInput(), nullptr /* ContentParent */,
|
||||||
nullptr /* ObjectUpgradeHandler */, &rv);
|
nullptr /* ObjectUpgradeHandler */, &rv);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -11,6 +11,7 @@
|
||||||
#include "mozilla/net/DocumentChannel.h"
|
#include "mozilla/net/DocumentChannel.h"
|
||||||
#include "mozilla/net/DocumentLoadListener.h"
|
#include "mozilla/net/DocumentLoadListener.h"
|
||||||
#include "nsIObserver.h"
|
#include "nsIObserver.h"
|
||||||
|
#include "nsIAsyncVerifyRedirectCallback.h"
|
||||||
|
|
||||||
namespace mozilla {
|
namespace mozilla {
|
||||||
namespace net {
|
namespace net {
|
||||||
|
|
|
@ -13,6 +13,7 @@
|
||||||
#include "nsIProtocolProxyService2.h"
|
#include "nsIProtocolProxyService2.h"
|
||||||
#include "nsNetUtil.h"
|
#include "nsNetUtil.h"
|
||||||
#include "nsThreadUtils.h"
|
#include "nsThreadUtils.h"
|
||||||
|
#include "nsIChannel.h"
|
||||||
|
|
||||||
namespace mozilla {
|
namespace mozilla {
|
||||||
namespace net {
|
namespace net {
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
|
|
||||||
#include <functional>
|
#include <functional>
|
||||||
#include "nsIProtocolProxyCallback.h"
|
#include "nsIProtocolProxyCallback.h"
|
||||||
|
#include "nsCOMPtr.h"
|
||||||
|
|
||||||
class nsIURI;
|
class nsIURI;
|
||||||
|
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
|
|
||||||
#include "mozilla/dom/ContentChild.h"
|
#include "mozilla/dom/ContentChild.h"
|
||||||
#include "mozilla/ipc/BackgroundChild.h"
|
#include "mozilla/ipc/BackgroundChild.h"
|
||||||
|
#include "mozilla/ipc/Endpoint.h"
|
||||||
#include "mozilla/net/NeckoChild.h"
|
#include "mozilla/net/NeckoChild.h"
|
||||||
#include "nsIObserverService.h"
|
#include "nsIObserverService.h"
|
||||||
#include "nsThreadUtils.h"
|
#include "nsThreadUtils.h"
|
||||||
|
|
|
@ -12,6 +12,8 @@
|
||||||
#include "nsIOService.h"
|
#include "nsIOService.h"
|
||||||
#include "nsIObserverService.h"
|
#include "nsIObserverService.h"
|
||||||
#include "ProfilerParent.h"
|
#include "ProfilerParent.h"
|
||||||
|
#include "nsNetUtil.h"
|
||||||
|
#include "mozilla/ipc/Endpoint.h"
|
||||||
|
|
||||||
#if defined(XP_LINUX) && defined(MOZ_SANDBOX)
|
#if defined(XP_LINUX) && defined(MOZ_SANDBOX)
|
||||||
# include "mozilla/SandboxBroker.h"
|
# include "mozilla/SandboxBroker.h"
|
||||||
|
|
|
@ -26,6 +26,9 @@
|
||||||
#include "nsIHttpActivityObserver.h"
|
#include "nsIHttpActivityObserver.h"
|
||||||
#include "nsIObserverService.h"
|
#include "nsIObserverService.h"
|
||||||
#include "nsNSSIOLayer.h"
|
#include "nsNSSIOLayer.h"
|
||||||
|
#include "nsIOService.h"
|
||||||
|
#include "nsHttpHandler.h"
|
||||||
|
#include "nsHttpConnectionInfo.h"
|
||||||
#include "PSMIPCCommon.h"
|
#include "PSMIPCCommon.h"
|
||||||
#include "secerr.h"
|
#include "secerr.h"
|
||||||
#ifdef MOZ_WEBRTC
|
#ifdef MOZ_WEBRTC
|
||||||
|
|
|
@ -109,5 +109,3 @@ LOCAL_INCLUDES += [
|
||||||
|
|
||||||
# Add libFuzzer configuration directives
|
# Add libFuzzer configuration directives
|
||||||
include("/tools/fuzzing/libfuzzer-config.mozbuild")
|
include("/tools/fuzzing/libfuzzer-config.mozbuild")
|
||||||
|
|
||||||
REQUIRES_UNIFIED_BUILD = True
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче