diff options
57 files changed, 102 insertions, 60 deletions
diff --git a/netwerk/base/PollableEvent.cpp b/netwerk/base/PollableEvent.cpp index 9cb45efde..af257808d 100644 --- a/netwerk/base/PollableEvent.cpp +++ b/netwerk/base/PollableEvent.cpp @@ -9,6 +9,7 @@ #include "mozilla/Assertions.h" #include "mozilla/DebugOnly.h" #include "mozilla/Logging.h" +#include "mozilla/net/DNS.h" #include "prerror.h" #include "prio.h" #include "private/pprio.h" @@ -21,6 +22,8 @@ #define USEPIPE 1 #endif +using namespace mozilla::net; + namespace mozilla { namespace net { diff --git a/netwerk/base/Predictor.cpp b/netwerk/base/Predictor.cpp index 12e4eb415..59109b8cf 100644 --- a/netwerk/base/Predictor.cpp +++ b/netwerk/base/Predictor.cpp @@ -35,6 +35,7 @@ #include "nsStreamUtils.h" #include "nsString.h" #include "nsThreadUtils.h" +#include "nsHttpRequestHead.h" #include "mozilla/Logging.h" #include "mozilla/Preferences.h" @@ -51,6 +52,7 @@ #include "mozilla/dom/ContentParent.h" using namespace mozilla; +using namespace mozilla::dom; namespace mozilla { namespace net { diff --git a/netwerk/base/ProxyAutoConfig.cpp b/netwerk/base/ProxyAutoConfig.cpp index 6a9577669..858e0e378 100644 --- a/netwerk/base/ProxyAutoConfig.cpp +++ b/netwerk/base/ProxyAutoConfig.cpp @@ -16,6 +16,7 @@ #include "jsfriendapi.h" #include "prnetdb.h" #include "nsITimer.h" +#include "mozilla/Mutex.h" #include "mozilla/net/DNS.h" #include "nsServiceManagerUtils.h" #include "nsNetCID.h" diff --git a/netwerk/base/ThrottleQueue.cpp b/netwerk/base/ThrottleQueue.cpp index d5b8a41df..05711c1a1 100644 --- a/netwerk/base/ThrottleQueue.cpp +++ b/netwerk/base/ThrottleQueue.cpp @@ -6,7 +6,9 @@ #include "ThrottleQueue.h" #include "nsISeekableStream.h" +#include "nsIEventTarget.h" #include "nsIAsyncInputStream.h" +#include "nsSocketTransportService2.h" #include "nsStreamUtils.h" #include "nsNetUtil.h" diff --git a/netwerk/base/ThrottleQueue.h b/netwerk/base/ThrottleQueue.h index 5e16c8ef6..9fb377cc8 100644 --- a/netwerk/base/ThrottleQueue.h +++ b/netwerk/base/ThrottleQueue.h @@ -8,8 +8,10 @@ #define mozilla_net_ThrottleQueue_h #include "mozilla/TimeStamp.h" +#include "nsCOMPtr.h" #include "nsIThrottledInputChannel.h" #include "nsITimer.h" +#include "nsTArray.h" namespace mozilla { namespace net { diff --git a/netwerk/base/moz.build b/netwerk/base/moz.build index 3198d746c..a9c7db845 100644 --- a/netwerk/base/moz.build +++ b/netwerk/base/moz.build @@ -182,7 +182,7 @@ EXPORTS.mozilla.net += [ 'ReferrerPolicy.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'ArrayBufferInputStream.cpp', 'BackgroundFileSaver.cpp', 'CaptivePortalService.cpp', diff --git a/netwerk/base/nsAsyncStreamCopier.cpp b/netwerk/base/nsAsyncStreamCopier.cpp index 6eec29d61..434304084 100644 --- a/netwerk/base/nsAsyncStreamCopier.cpp +++ b/netwerk/base/nsAsyncStreamCopier.cpp @@ -14,6 +14,7 @@ #include "mozilla/Logging.h" using namespace mozilla; +using namespace mozilla::net; #undef LOG // 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(); diff --git a/netwerk/base/nsChannelClassifier.cpp b/netwerk/base/nsChannelClassifier.cpp index 6b9f9ede3..8fc398de6 100644 --- a/netwerk/base/nsChannelClassifier.cpp +++ b/netwerk/base/nsChannelClassifier.cpp @@ -17,6 +17,7 @@ #include "nsIDOMDocument.h" #include "nsIHttpChannelInternal.h" #include "nsIIOService.h" +#include "nsILoadContext.h" #include "nsIParentChannel.h" #include "nsIPermissionManager.h" #include "nsIPrivateBrowsingTrackingProtectionWhitelist.h" diff --git a/netwerk/base/nsInputStreamPump.cpp b/netwerk/base/nsInputStreamPump.cpp index 19c2a790a..0f47dfb5b 100644 --- a/netwerk/base/nsInputStreamPump.cpp +++ b/netwerk/base/nsInputStreamPump.cpp @@ -19,6 +19,9 @@ #include "nsNetCID.h" #include <algorithm> +using namespace mozilla; +using namespace mozilla::net; + static NS_DEFINE_CID(kStreamTransportServiceCID, NS_STREAMTRANSPORTSERVICE_CID); // diff --git a/netwerk/base/nsMIMEInputStream.cpp b/netwerk/base/nsMIMEInputStream.cpp index ce1188ea0..5829f7ae4 100644 --- a/netwerk/base/nsMIMEInputStream.cpp +++ b/netwerk/base/nsMIMEInputStream.cpp @@ -24,6 +24,7 @@ using namespace mozilla::ipc; using mozilla::Maybe; +using mozilla::Nothing; class nsMIMEInputStream : public nsIMIMEInputStream, public nsISeekableStream, diff --git a/netwerk/base/nsStandardURL.cpp b/netwerk/base/nsStandardURL.cpp index 7317240c2..81b485502 100644 --- a/netwerk/base/nsStandardURL.cpp +++ b/netwerk/base/nsStandardURL.cpp @@ -26,6 +26,7 @@ #include "nsContentUtils.h" #include "prprf.h" #include "nsReadableUtils.h" +#include "nsPrintfCString.h" using mozilla::dom::EncodingUtils; using namespace mozilla::ipc; diff --git a/netwerk/base/nsSyncStreamListener.cpp b/netwerk/base/nsSyncStreamListener.cpp index e80e885c5..af24a8957 100644 --- a/netwerk/base/nsSyncStreamListener.cpp +++ b/netwerk/base/nsSyncStreamListener.cpp @@ -8,6 +8,8 @@ #include "nsThreadUtils.h" #include <algorithm> +using namespace mozilla::net; + nsresult nsSyncStreamListener::Init() { diff --git a/netwerk/base/nsTemporaryFileInputStream.cpp b/netwerk/base/nsTemporaryFileInputStream.cpp index c7c5b0648..86dc9e06d 100644 --- a/netwerk/base/nsTemporaryFileInputStream.cpp +++ b/netwerk/base/nsTemporaryFileInputStream.cpp @@ -4,9 +4,16 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "nsTemporaryFileInputStream.h" + +#include "mozilla/ipc/InputStreamUtils.h" +#include "mozilla/Mutex.h" #include "nsStreamUtils.h" +#include "private/pprio.h" #include <algorithm> +using namespace mozilla; +using namespace mozilla::ipc; + typedef mozilla::ipc::FileDescriptor::PlatformHandleType FileHandleType; NS_IMPL_ISUPPORTS(nsTemporaryFileInputStream, diff --git a/netwerk/cache/moz.build b/netwerk/cache/moz.build index adf6e8bd2..d343cc5f5 100644 --- a/netwerk/cache/moz.build +++ b/netwerk/cache/moz.build @@ -21,7 +21,7 @@ EXPORTS += [ 'nsDeleteDir.h' ] -UNIFIED_SOURCES += [ +SOURCES += [ 'nsApplicationCacheService.cpp', 'nsCache.cpp', 'nsCacheEntry.cpp', diff --git a/netwerk/cache/nsDiskCacheDeviceSQL.cpp b/netwerk/cache/nsDiskCacheDeviceSQL.cpp index f4b1d72c9..69cc15130 100644 --- a/netwerk/cache/nsDiskCacheDeviceSQL.cpp +++ b/netwerk/cache/nsDiskCacheDeviceSQL.cpp @@ -10,6 +10,7 @@ #include "mozilla/Attributes.h" #include "mozilla/Sprintf.h" #include "mozilla/ThreadLocal.h" +#include "mozilla/Unused.h" #include "nsCache.h" #include "nsDiskCache.h" @@ -57,6 +58,7 @@ using namespace mozilla::storage; using mozilla::NeckoOriginAttributes; static const char OFFLINE_CACHE_DEVICE_ID[] = { "offline" }; +static NS_DEFINE_CID(kCacheServiceCID, NS_CACHESERVICE_CID); #define LOG(args) CACHE_LOG_DEBUG(args) diff --git a/netwerk/cache2/CacheFile.h b/netwerk/cache2/CacheFile.h index 3c8f7e97d..6d9d433b6 100644 --- a/netwerk/cache2/CacheFile.h +++ b/netwerk/cache2/CacheFile.h @@ -10,6 +10,7 @@ #include "CacheFileMetadata.h" #include "nsRefPtrHashtable.h" #include "nsClassHashtable.h" +#include "nsICacheEntry.h" #include "mozilla/Mutex.h" class nsIInputStream; diff --git a/netwerk/cache2/CacheFileContextEvictor.cpp b/netwerk/cache2/CacheFileContextEvictor.cpp index acf089b79..65feb4462 100644 --- a/netwerk/cache2/CacheFileContextEvictor.cpp +++ b/netwerk/cache2/CacheFileContextEvictor.cpp @@ -8,6 +8,7 @@ #include "CacheIndex.h" #include "CacheIndexIterator.h" #include "CacheFileUtils.h" +#include "CacheObserver.h" #include "nsIFile.h" #include "LoadContextInfo.h" #include "nsThreadUtils.h" diff --git a/netwerk/cache2/CacheFileUtils.cpp b/netwerk/cache2/CacheFileUtils.cpp index a090a9cb1..11dee4e99 100644 --- a/netwerk/cache2/CacheFileUtils.cpp +++ b/netwerk/cache2/CacheFileUtils.cpp @@ -5,6 +5,7 @@ #include "CacheIndex.h" #include "CacheLog.h" #include "CacheFileUtils.h" +#include "CacheObserver.h" #include "LoadContextInfo.h" #include "mozilla/Tokenizer.h" #include "nsCOMPtr.h" diff --git a/netwerk/cache2/CacheHashUtils.cpp b/netwerk/cache2/CacheHashUtils.cpp index 1f816e347..6783f0b86 100644 --- a/netwerk/cache2/CacheHashUtils.cpp +++ b/netwerk/cache2/CacheHashUtils.cpp @@ -6,6 +6,7 @@ #include "mozilla/BasePrincipal.h" #include "plstr.h" +#include "mozilla/SHA1.h" namespace mozilla { namespace net { diff --git a/netwerk/cache2/CacheIOThread.cpp b/netwerk/cache2/CacheIOThread.cpp index 2fbc0ccce..c686c0f8d 100644 --- a/netwerk/cache2/CacheIOThread.cpp +++ b/netwerk/cache2/CacheIOThread.cpp @@ -4,6 +4,8 @@ #include "CacheIOThread.h" #include "CacheFileIOManager.h" +#include "CacheObserver.h" +#include "CacheLog.h" #include "nsIRunnable.h" #include "nsISupportsImpl.h" diff --git a/netwerk/cache2/moz.build b/netwerk/cache2/moz.build index 4fc6db59d..ce30e85af 100644 --- a/netwerk/cache2/moz.build +++ b/netwerk/cache2/moz.build @@ -21,7 +21,8 @@ EXPORTS += [ 'CacheStorageService.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ + 'AppCacheStorage.cpp', 'CacheEntry.cpp', 'CacheFile.cpp', 'CacheFileChunk.cpp', @@ -43,11 +44,6 @@ UNIFIED_SOURCES += [ 'OldWrappers.cpp', ] -# AppCacheStorage.cpp cannot be built in unified mode because it uses plarena.h. -SOURCES += [ - 'AppCacheStorage.cpp', -] - LOCAL_INCLUDES += [ '/netwerk/base', '/netwerk/cache', diff --git a/netwerk/cookie/moz.build b/netwerk/cookie/moz.build index 207790008..95e27e94b 100644 --- a/netwerk/cookie/moz.build +++ b/netwerk/cookie/moz.build @@ -21,13 +21,10 @@ if CONFIG['NECKO_COOKIES']: 'CookieServiceChild.h', 'CookieServiceParent.h', ] - UNIFIED_SOURCES += [ + SOURCES += [ 'CookieServiceChild.cpp', 'CookieServiceParent.cpp', 'nsCookie.cpp', - ] - # nsCookieService.cpp can't be unified because of symbol conflicts - SOURCES += [ 'nsCookieService.cpp', ] LOCAL_INCLUDES += [ diff --git a/netwerk/dns/mdns/libmdns/moz.build b/netwerk/dns/mdns/libmdns/moz.build index b7d376fc3..feab013ff 100644 --- a/netwerk/dns/mdns/libmdns/moz.build +++ b/netwerk/dns/mdns/libmdns/moz.build @@ -5,7 +5,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': - UNIFIED_SOURCES += [ + SOURCES += [ 'MDNSResponderOperator.cpp', 'MDNSResponderReply.cpp', 'nsDNSServiceDiscovery.cpp', @@ -31,7 +31,7 @@ else: 'fallback/MulticastDNS.jsm', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'nsDNSServiceInfo.cpp', 'nsMulticastDNSModule.cpp', ] diff --git a/netwerk/dns/mdns/libmdns/nsDNSServiceDiscovery.h b/netwerk/dns/mdns/libmdns/nsDNSServiceDiscovery.h index 9bf2c798a..abe98f357 100644 --- a/netwerk/dns/mdns/libmdns/nsDNSServiceDiscovery.h +++ b/netwerk/dns/mdns/libmdns/nsDNSServiceDiscovery.h @@ -6,6 +6,7 @@ #ifndef mozilla_netwerk_dns_mdns_libmdns_nsDNSServiceDiscovery_h #define mozilla_netwerk_dns_mdns_libmdns_nsDNSServiceDiscovery_h +#include "MDNSResponderOperator.h" #include "nsIDNSServiceDiscovery.h" #include "nsCOMPtr.h" #include "mozilla/RefPtr.h" diff --git a/netwerk/dns/moz.build b/netwerk/dns/moz.build index c3b84df2f..437f69bc5 100644 --- a/netwerk/dns/moz.build +++ b/netwerk/dns/moz.build @@ -29,11 +29,6 @@ EXPORTS.mozilla.net += [ ] SOURCES += [ - 'nsEffectiveTLDService.cpp', # Excluded from UNIFIED_SOURCES due to special build flags. - 'nsHostResolver.cpp', # Redefines LOG -] - -UNIFIED_SOURCES += [ 'ChildDNSService.cpp', 'DNS.cpp', 'DNSListenerProxy.cpp', @@ -41,6 +36,8 @@ UNIFIED_SOURCES += [ 'DNSRequestParent.cpp', 'GetAddrInfo.cpp', 'nsDNSService2.cpp', + 'nsEffectiveTLDService.cpp', + 'nsHostResolver.cpp', 'nsIDNService.cpp', 'punycode.c', ] diff --git a/netwerk/ipc/NeckoParent.cpp b/netwerk/ipc/NeckoParent.cpp index 5913b59d9..e57481c55 100644 --- a/netwerk/ipc/NeckoParent.cpp +++ b/netwerk/ipc/NeckoParent.cpp @@ -45,6 +45,8 @@ #include "nsINetworkPredictor.h" #include "nsINetworkPredictorVerifier.h" #include "nsISpeculativeConnect.h" +#include "nsIOService.h" +#include "mozilla/ipc/URIUtils.h" using mozilla::DocShellOriginAttributes; using mozilla::NeckoOriginAttributes; diff --git a/netwerk/ipc/moz.build b/netwerk/ipc/moz.build index 0740e6f6b..d2bb10501 100644 --- a/netwerk/ipc/moz.build +++ b/netwerk/ipc/moz.build @@ -12,7 +12,7 @@ EXPORTS.mozilla.net += [ 'NeckoParent.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'ChannelEventQueue.cpp', 'NeckoChild.cpp', 'NeckoCommon.cpp', diff --git a/netwerk/protocol/about/moz.build b/netwerk/protocol/about/moz.build index 60a10c9cc..7c1842a4d 100644 --- a/netwerk/protocol/about/moz.build +++ b/netwerk/protocol/about/moz.build @@ -14,7 +14,7 @@ EXPORTS += [ 'nsAboutProtocolUtils.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'nsAboutBlank.cpp', 'nsAboutCache.cpp', 'nsAboutCacheEntry.cpp', diff --git a/netwerk/protocol/about/nsAboutCache.h b/netwerk/protocol/about/nsAboutCache.h index c2d1af850..6fb837eac 100644 --- a/netwerk/protocol/about/nsAboutCache.h +++ b/netwerk/protocol/about/nsAboutCache.h @@ -9,6 +9,7 @@ #include "nsIAboutModule.h" #include "nsICacheStorageVisitor.h" #include "nsICacheStorage.h" +#include "nsIChannel.h" #include "nsString.h" #include "nsIOutputStream.h" diff --git a/netwerk/protocol/about/nsAboutCacheEntry.h b/netwerk/protocol/about/nsAboutCacheEntry.h index 44a78760b..8bfa0aa72 100644 --- a/netwerk/protocol/about/nsAboutCacheEntry.h +++ b/netwerk/protocol/about/nsAboutCacheEntry.h @@ -9,6 +9,7 @@ #include "nsIAboutModule.h" #include "nsICacheEntryOpenCallback.h" #include "nsICacheEntry.h" +#include "nsIChannel.h" #include "nsIStreamListener.h" #include "nsString.h" #include "nsCOMPtr.h" diff --git a/netwerk/protocol/about/nsAboutProtocolHandler.cpp b/netwerk/protocol/about/nsAboutProtocolHandler.cpp index 998fc71f9..905ecb5a6 100644 --- a/netwerk/protocol/about/nsAboutProtocolHandler.cpp +++ b/netwerk/protocol/about/nsAboutProtocolHandler.cpp @@ -20,6 +20,7 @@ #include "nsIWritablePropertyBag2.h" #include "nsIChannel.h" #include "nsIScriptError.h" +#include "nsContentUtils.h" namespace mozilla { namespace net { diff --git a/netwerk/protocol/data/moz.build b/netwerk/protocol/data/moz.build index 0958118fa..2c45b8067 100644 --- a/netwerk/protocol/data/moz.build +++ b/netwerk/protocol/data/moz.build @@ -8,7 +8,7 @@ EXPORTS.mozilla.net += [ 'DataChannelParent.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'DataChannelChild.cpp', 'DataChannelParent.cpp', 'nsDataChannel.cpp', diff --git a/netwerk/protocol/data/nsDataChannel.cpp b/netwerk/protocol/data/nsDataChannel.cpp index 608a6c6e0..148a7901a 100644 --- a/netwerk/protocol/data/nsDataChannel.cpp +++ b/netwerk/protocol/data/nsDataChannel.cpp @@ -16,6 +16,7 @@ #include "nsEscape.h" using namespace mozilla; +using namespace mozilla::net; nsresult nsDataChannel::OpenContentStream(bool async, nsIInputStream **result, diff --git a/netwerk/protocol/device/moz.build b/netwerk/protocol/device/moz.build index 3bb95930e..6900e725a 100644 --- a/netwerk/protocol/device/moz.build +++ b/netwerk/protocol/device/moz.build @@ -4,7 +4,7 @@ # 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/. -UNIFIED_SOURCES += [ +SOURCES += [ 'nsDeviceChannel.cpp', 'nsDeviceProtocolHandler.cpp', ] diff --git a/netwerk/protocol/file/moz.build b/netwerk/protocol/file/moz.build index 223ff2f2b..c6be28ef2 100644 --- a/netwerk/protocol/file/moz.build +++ b/netwerk/protocol/file/moz.build @@ -15,7 +15,7 @@ XPIDL_SOURCES += [ XPIDL_MODULE = 'necko_file' -UNIFIED_SOURCES += [ +SOURCES += [ 'nsFileChannel.cpp', 'nsFileProtocolHandler.cpp', ] diff --git a/netwerk/protocol/file/nsFileProtocolHandler.cpp b/netwerk/protocol/file/nsFileProtocolHandler.cpp index e55cb9d47..3896dabad 100644 --- a/netwerk/protocol/file/nsFileProtocolHandler.cpp +++ b/netwerk/protocol/file/nsFileProtocolHandler.cpp @@ -28,6 +28,8 @@ #define DESKTOP_ENTRY_SECTION "Desktop Entry" #endif +using namespace mozilla::net; + //----------------------------------------------------------------------------- nsFileProtocolHandler::nsFileProtocolHandler() diff --git a/netwerk/protocol/ftp/moz.build b/netwerk/protocol/ftp/moz.build index 060fb7575..f132dfdd3 100644 --- a/netwerk/protocol/ftp/moz.build +++ b/netwerk/protocol/ftp/moz.build @@ -20,7 +20,7 @@ EXPORTS.mozilla.net += [ 'FTPChannelParent.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'FTPChannelChild.cpp', 'FTPChannelParent.cpp', 'nsFTPChannel.cpp', diff --git a/netwerk/protocol/ftp/nsFTPChannel.cpp b/netwerk/protocol/ftp/nsFTPChannel.cpp index 2a0f04915..5c5bee920 100644 --- a/netwerk/protocol/ftp/nsFTPChannel.cpp +++ b/netwerk/protocol/ftp/nsFTPChannel.cpp @@ -14,6 +14,9 @@ using namespace mozilla; using namespace mozilla::net; extern LazyLogModule gFTPLog; +#undef LOG +#define LOG(args) MOZ_LOG(gFTPLog, mozilla::LogLevel::Debug, args) + // There are two transport connections established for an // ftp connection. One is used for the command channel , and // the other for the data channel. The command channel is the first diff --git a/netwerk/protocol/ftp/nsFTPChannel.h b/netwerk/protocol/ftp/nsFTPChannel.h index 549e577b3..f829c5f59 100644 --- a/netwerk/protocol/ftp/nsFTPChannel.h +++ b/netwerk/protocol/ftp/nsFTPChannel.h @@ -18,6 +18,7 @@ #include "nsIProxyInfo.h" #include "nsIProxiedChannel.h" #include "nsIResumableChannel.h" +#include "ADivertableParentChannel.h" class nsIURI; using mozilla::net::ADivertableParentChannel; diff --git a/netwerk/protocol/http/Http2Push.cpp b/netwerk/protocol/http/Http2Push.cpp index 34fc425d2..a1bbd72cc 100644 --- a/netwerk/protocol/http/Http2Push.cpp +++ b/netwerk/protocol/http/Http2Push.cpp @@ -19,6 +19,7 @@ #include "nsHttpChannel.h" #include "nsIHttpPushListener.h" #include "nsString.h" +#include "nsSocketTransportService2.h" namespace mozilla { namespace net { diff --git a/netwerk/protocol/http/HttpBaseChannel.cpp b/netwerk/protocol/http/HttpBaseChannel.cpp index 568ef3012..a53022f71 100644 --- a/netwerk/protocol/http/HttpBaseChannel.cpp +++ b/netwerk/protocol/http/HttpBaseChannel.cpp @@ -11,6 +11,7 @@ #include "mozilla/net/HttpBaseChannel.h" #include "nsHttpHandler.h" +#include "nsHttpChannel.h" #include "nsMimeTypes.h" #include "nsNetCID.h" #include "nsNetUtil.h" diff --git a/netwerk/protocol/http/HttpChannelChild.cpp b/netwerk/protocol/http/HttpChannelChild.cpp index 0a1e0f859..5d17b42b2 100644 --- a/netwerk/protocol/http/HttpChannelChild.cpp +++ b/netwerk/protocol/http/HttpChannelChild.cpp @@ -18,6 +18,7 @@ #include "mozilla/net/NeckoChild.h" #include "mozilla/net/HttpChannelChild.h" +#include "AltDataOutputStreamChild.h" #include "nsISupportsPrimitives.h" #include "nsChannelClassifier.h" #include "nsStringStream.h" diff --git a/netwerk/protocol/http/HttpChannelParent.cpp b/netwerk/protocol/http/HttpChannelParent.cpp index 7c88b9222..36a02e0fa 100644 --- a/netwerk/protocol/http/HttpChannelParent.cpp +++ b/netwerk/protocol/http/HttpChannelParent.cpp @@ -24,6 +24,7 @@ #include "nsIAssociatedContentSecurity.h" #include "nsIApplicationCacheService.h" #include "mozilla/ipc/InputStreamUtils.h" +#include "mozilla/ipc/IPCStreamUtils.h" #include "mozilla/ipc/URIUtils.h" #include "SerializedLoadContext.h" #include "nsIAuthInformation.h" @@ -40,6 +41,8 @@ #include "nsIWindowWatcher.h" #include "nsIDocument.h" #include "nsStringStream.h" +#include "nsIStorageStream.h" +#include "nsStreamUtils.h" using mozilla::BasePrincipal; using namespace mozilla::dom; diff --git a/netwerk/protocol/http/HttpChannelParentListener.cpp b/netwerk/protocol/http/HttpChannelParentListener.cpp index 59030cf99..d5fd77dd1 100644 --- a/netwerk/protocol/http/HttpChannelParentListener.cpp +++ b/netwerk/protocol/http/HttpChannelParentListener.cpp @@ -16,6 +16,7 @@ #include "nsIHttpHeaderVisitor.h" #include "nsIRedirectChannelRegistrar.h" #include "nsIPromptFactory.h" +#include "nsIWindowWatcher.h" #include "nsQueryObject.h" using mozilla::Unused; diff --git a/netwerk/protocol/http/moz.build b/netwerk/protocol/http/moz.build index a1b57876b..8e3c51010 100644 --- a/netwerk/protocol/http/moz.build +++ b/netwerk/protocol/http/moz.build @@ -43,18 +43,11 @@ EXPORTS.mozilla.net += [ 'TimingStruct.h', ] -# ASpdySession.cpp and nsHttpAuthCache cannot be built in unified mode because -# they use plarena.h. SOURCES += [ - 'AlternateServices.cpp', - 'ASpdySession.cpp', - 'nsHttpAuthCache.cpp', - 'nsHttpChannelAuthProvider.cpp', # redefines GetAuthType -] - -UNIFIED_SOURCES += [ 'AltDataOutputStreamChild.cpp', 'AltDataOutputStreamParent.cpp', + 'AlternateServices.cpp', + 'ASpdySession.cpp', 'CacheControlParser.cpp', 'ConnectionDiagnostics.cpp', 'Http2Compression.cpp', @@ -70,14 +63,17 @@ UNIFIED_SOURCES += [ 'nsCORSListenerProxy.cpp', 'nsHttp.cpp', 'nsHttpActivityDistributor.cpp', + 'nsHttpAuthCache.cpp', 'nsHttpAuthManager.cpp', 'nsHttpBasicAuth.cpp', 'nsHttpChannel.cpp', + 'nsHttpChannelAuthProvider.cpp', 'nsHttpChunkedDecoder.cpp', 'nsHttpConnection.cpp', 'nsHttpConnectionInfo.cpp', 'nsHttpConnectionMgr.cpp', 'nsHttpDigestAuth.cpp', + 'nsHttpHandler.cpp', 'nsHttpHeaderArray.cpp', 'nsHttpNTLMAuth.cpp', 'nsHttpPipeline.cpp', @@ -89,11 +85,6 @@ UNIFIED_SOURCES += [ 'TunnelUtils.cpp', ] -# These files cannot be built in unified mode because of OS X headers. -SOURCES += [ - 'nsHttpHandler.cpp', -] - IPDL_SOURCES += [ 'PAltDataOutputStream.ipdl', 'PHttpChannel.ipdl', diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp index 950b1a7ab..464f7507d 100644 --- a/netwerk/protocol/http/nsHttpChannel.cpp +++ b/netwerk/protocol/http/nsHttpChannel.cpp @@ -24,6 +24,7 @@ #include "nsICryptoHash.h" #include "nsINetworkInterceptController.h" #include "nsINSSErrorsService.h" +#include "nsIScriptError.h" #include "nsIStringBundle.h" #include "nsIStreamListenerTee.h" #include "nsISeekableStream.h" diff --git a/netwerk/protocol/http/nsHttpChannel.h b/netwerk/protocol/http/nsHttpChannel.h index defd710c3..b7f39b2f0 100644 --- a/netwerk/protocol/http/nsHttpChannel.h +++ b/netwerk/protocol/http/nsHttpChannel.h @@ -35,7 +35,10 @@ class nsIHttpChannelAuthProvider; class nsInputStreamPump; class nsISSLStatus; -namespace mozilla { namespace net { +namespace mozilla { +namespace net { + +bool WillRedirect(nsHttpResponseHead * response); class Http2PushedStream; diff --git a/netwerk/protocol/res/moz.build b/netwerk/protocol/res/moz.build index 37e2316b0..463d8e0fe 100644 --- a/netwerk/protocol/res/moz.build +++ b/netwerk/protocol/res/moz.build @@ -11,7 +11,7 @@ XPIDL_SOURCES += [ XPIDL_MODULE = 'necko_res' -UNIFIED_SOURCES += [ +SOURCES += [ 'ExtensionProtocolHandler.cpp', 'nsResProtocolHandler.cpp', 'SubstitutingProtocolHandler.cpp', diff --git a/netwerk/protocol/viewsource/moz.build b/netwerk/protocol/viewsource/moz.build index 4e3303c40..986ebf14e 100644 --- a/netwerk/protocol/viewsource/moz.build +++ b/netwerk/protocol/viewsource/moz.build @@ -10,7 +10,7 @@ XPIDL_SOURCES += [ XPIDL_MODULE = 'necko_viewsource' -UNIFIED_SOURCES += [ +SOURCES += [ 'nsViewSourceChannel.cpp', 'nsViewSourceHandler.cpp', ] diff --git a/netwerk/protocol/wyciwyg/moz.build b/netwerk/protocol/wyciwyg/moz.build index b043137f7..e5e02ce98 100644 --- a/netwerk/protocol/wyciwyg/moz.build +++ b/netwerk/protocol/wyciwyg/moz.build @@ -15,7 +15,7 @@ EXPORTS.mozilla.net += [ 'WyciwygChannelParent.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'nsWyciwyg.cpp', 'nsWyciwygChannel.cpp', 'nsWyciwygProtocolHandler.cpp', diff --git a/netwerk/socket/moz.build b/netwerk/socket/moz.build index 34361a10c..771d92ad7 100644 --- a/netwerk/socket/moz.build +++ b/netwerk/socket/moz.build @@ -18,7 +18,7 @@ LOCAL_INCLUDES += [ '/netwerk/base', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'nsSocketProviderService.cpp', 'nsSOCKSIOLayer.cpp', 'nsSOCKSSocketProvider.cpp', @@ -29,7 +29,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': XPIDL_SOURCES += [ 'nsINamedPipeService.idl', ] - UNIFIED_SOURCES += [ + SOURCES += [ 'nsNamedPipeIOLayer.cpp', 'nsNamedPipeService.cpp' ] diff --git a/netwerk/socket/nsSOCKSSocketProvider.cpp b/netwerk/socket/nsSOCKSSocketProvider.cpp index c62534f7b..b21fe921f 100644 --- a/netwerk/socket/nsSOCKSSocketProvider.cpp +++ b/netwerk/socket/nsSOCKSSocketProvider.cpp @@ -12,6 +12,7 @@ #include "nsError.h" using mozilla::NeckoOriginAttributes; +using namespace mozilla::net; ////////////////////////////////////////////////////////////////////////// diff --git a/netwerk/srtp/src/moz.build b/netwerk/srtp/src/moz.build index 3e871702f..996d8c601 100644 --- a/netwerk/srtp/src/moz.build +++ b/netwerk/srtp/src/moz.build @@ -4,7 +4,7 @@ # 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/. -UNIFIED_SOURCES += [ +SOURCES += [ 'crypto/cipher/aes.c', 'crypto/cipher/aes_cbc.c', 'crypto/cipher/aes_icm.c', diff --git a/netwerk/streamconv/converters/moz.build b/netwerk/streamconv/converters/moz.build index 10354357b..4c0d177c5 100644 --- a/netwerk/streamconv/converters/moz.build +++ b/netwerk/streamconv/converters/moz.build @@ -10,7 +10,7 @@ XPIDL_SOURCES += [ XPIDL_MODULE = 'necko_http' -UNIFIED_SOURCES += [ +SOURCES += [ 'mozTXTToHTMLConv.cpp', 'nsDirIndex.cpp', 'nsDirIndexParser.cpp', @@ -22,13 +22,13 @@ UNIFIED_SOURCES += [ ] if 'ftp' in CONFIG['NECKO_PROTOCOLS']: - UNIFIED_SOURCES += [ + SOURCES += [ 'nsFTPDirListingConv.cpp', 'ParseFTPList.cpp', ] if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'cocoa': - UNIFIED_SOURCES += [ + SOURCES += [ 'nsBinHexDecoder.cpp', ] diff --git a/netwerk/streamconv/converters/nsHTTPCompressConv.cpp b/netwerk/streamconv/converters/nsHTTPCompressConv.cpp index c35b0dcac..2821c9aed 100644 --- a/netwerk/streamconv/converters/nsHTTPCompressConv.cpp +++ b/netwerk/streamconv/converters/nsHTTPCompressConv.cpp @@ -15,8 +15,10 @@ #include "nsThreadUtils.h" #include "mozilla/Preferences.h" #include "mozilla/Logging.h" +#include "mozilla/UniquePtrExtensions.h" #include "nsIForcePendingChannel.h" #include "nsIRequest.h" +#include <inttypes.h> // brotli headers #include "state.h" diff --git a/netwerk/wifi/moz.build b/netwerk/wifi/moz.build index 28149cb78..6e351da00 100644 --- a/netwerk/wifi/moz.build +++ b/netwerk/wifi/moz.build @@ -12,16 +12,13 @@ XPIDL_SOURCES += [ XPIDL_MODULE = 'necko_wifi' -UNIFIED_SOURCES += [ +SOURCES += [ 'nsWifiAccessPoint.cpp', -] - -UNIFIED_SOURCES += [ 'nsWifiMonitor.cpp', ] if CONFIG['OS_ARCH'] == 'Darwin': - UNIFIED_SOURCES += [ + SOURCES += [ 'nsWifiScannerMac.cpp', ] SOURCES += [ @@ -32,23 +29,23 @@ if CONFIG['OS_ARCH'] == 'Darwin': # to accept the warnings when targeting the newer SDKs. SOURCES['osx_corewlan.mm'].flags += ['-Wno-error=objc-method-access'] elif CONFIG['OS_ARCH'] in ('DragonFly', 'FreeBSD'): - UNIFIED_SOURCES += [ + SOURCES += [ 'nsWifiScannerFreeBSD.cpp', ] elif CONFIG['OS_ARCH'] == 'WINNT': - UNIFIED_SOURCES += [ + SOURCES += [ 'nsWifiScannerWin.cpp', 'win_wifiScanner.cpp', 'win_wlanLibrary.cpp', ] elif CONFIG['OS_ARCH'] == 'SunOS': CXXFLAGS += CONFIG['GLIB_CFLAGS'] - UNIFIED_SOURCES += [ + SOURCES += [ 'nsWifiScannerSolaris.cpp', ] if CONFIG['NECKO_WIFI_DBUS']: - UNIFIED_SOURCES += [ + SOURCES += [ 'nsWifiScannerDBus.cpp', ] CXXFLAGS += ['-Wno-error=shadow'] |