author | James Kitchener <jkitch.bug@internode.on.net> |
Tue, 20 Jan 2015 03:58:00 -0500 | |
changeset 224853 | 4ec37503ea6a752baf92e053ede5f0ff7750ff36 |
parent 224852 | 0028312fac1d39e82f93ab63f0e3848a629766fe |
child 224854 | 3de3af63a33f315e94b29963667184b9e067574a |
push id | 28146 |
push user | cbook@mozilla.com |
push date | Wed, 21 Jan 2015 13:22:59 +0000 |
treeherder | mozilla-central@0f2b4a7a9daf [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | mcmanus, poiru |
bugs | 1100184 |
milestone | 38.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/chrome/moz.build +++ b/chrome/moz.build @@ -30,17 +30,17 @@ include('/ipc/chromium/chromium-config.m FINAL_LIBRARY = 'xul' GENERATED_INCLUDES += [ '/xpcom', ] LOCAL_INCLUDES += [ - '/netwerk/base/src', + '/netwerk/base', '/netwerk/protocol/res', '/xpcom/components' ] if CONFIG['MOZ_ENABLE_GTK']: CXXFLAGS += CONFIG['TK_CFLAGS'] FAIL_ON_WARNINGS = True
--- a/dom/base/moz.build +++ b/dom/base/moz.build @@ -406,17 +406,17 @@ LOCAL_INCLUDES += [ '/js/ipc', '/js/xpconnect/src', '/js/xpconnect/wrappers', '/layout/base', '/layout/generic', '/layout/style', '/layout/svg', '/layout/xul', - '/netwerk/base/src', + '/netwerk/base', '/widget', '/xpcom/ds', ] if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': LOCAL_INCLUDES += [ '../fmradio', '../system/gonk',
--- a/dom/html/moz.build +++ b/dom/html/moz.build @@ -236,12 +236,12 @@ LOCAL_INCLUDES += [ '/dom/xul', '/editor/libeditor', '/editor/txmgr', '/layout/forms', '/layout/generic', '/layout/style', '/layout/tables', '/layout/xul', - '/netwerk/base/src', + '/netwerk/base', ] FINAL_LIBRARY = 'xul'
--- a/dom/ipc/moz.build +++ b/dom/ipc/moz.build @@ -127,17 +127,17 @@ LOCAL_INCLUDES += [ '/dom/workers', '/editor/libeditor', '/embedding/components/printingui/ipc', '/extensions/cookie', '/extensions/spellcheck/src', '/hal/sandbox', '/js/ipc', '/layout/base', - '/netwerk/base/src', + '/netwerk/base', '/toolkit/xre', '/uriloader/exthandler', '/widget', '/xpcom/base', '/xpcom/threads', ] DEFINES['BIN_SUFFIX'] = '"%s"' % CONFIG['BIN_SUFFIX']
--- a/dom/jsurl/moz.build +++ b/dom/jsurl/moz.build @@ -11,14 +11,14 @@ EXPORTS += [ UNIFIED_SOURCES += [ 'nsJSProtocolHandler.cpp', ] FAIL_ON_WARNINGS = True LOCAL_INCLUDES += [ "/dom/base", - "/netwerk/base/src", + "/netwerk/base", ] FINAL_LIBRARY = 'xul' MOCHITEST_MANIFESTS += ['test/mochitest.ini']
--- a/dom/media/moz.build +++ b/dom/media/moz.build @@ -246,17 +246,17 @@ FAIL_ON_WARNINGS = True MSVC_ENABLE_PGO = True LOCAL_INCLUDES += [ '/caps', '/dom/base', '/dom/camera', '/layout/generic', '/layout/xul', - '/netwerk/base/src', + '/netwerk/base', ] if CONFIG['MOZ_DIRECTSHOW']: LOCAL_INCLUDES += [ '/media/webrtc/trunk/webrtc/modules/video_capture/windows', ] if CONFIG['MOZ_WEBRTC']:
--- a/dom/security/moz.build +++ b/dom/security/moz.build @@ -26,10 +26,10 @@ UNIFIED_SOURCES += [ 'nsMixedContentBlocker.cpp', ] FAIL_ON_WARNINGS = True FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ '/caps', - '/netwerk/base/src', + '/netwerk/base', ]
--- a/image/src/moz.build +++ b/image/src/moz.build @@ -61,13 +61,13 @@ LOCAL_INCLUDES += [ '/dom/svg', # Access to Skia headers for Downscaler '/gfx/2d', # We need to instantiate the decoders '/image/decoders', # Because VectorImage.cpp includes nsSVGUtils.h and nsSVGEffects.h '/layout/svg', # For URI-related functionality - '/netwerk/base/src', + '/netwerk/base', ] # Because imgFrame.cpp includes "cairo.h" CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
--- a/layout/build/moz.build +++ b/layout/build/moz.build @@ -62,17 +62,17 @@ LOCAL_INCLUDES += [ '/dom/xul/templates', '/editor/composer', '/editor/libeditor', '/editor/txmgr', '/editor/txtsvc', '/extensions/cookie', '/js/xpconnect/loader', '/js/xpconnect/src', - '/netwerk/base/src', + '/netwerk/base', '/netwerk/cookie', '/view', ] if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': LOCAL_INCLUDES += [ '/dom/system/windows', ]
--- a/mobile/android/base/GeckoAppShell.java +++ b/mobile/android/base/GeckoAppShell.java @@ -235,17 +235,17 @@ public class GeckoAppShell * http://mxr.mozilla.org/mozilla-central/source/uriloader/base/nsIWebProgressListener.idl */ static public final int WPL_STATE_START = 0x00000001; static public final int WPL_STATE_STOP = 0x00000010; static public final int WPL_STATE_IS_DOCUMENT = 0x00020000; static public final int WPL_STATE_IS_NETWORK = 0x00040000; /* Keep in sync with constants found here: - http://mxr.mozilla.org/mozilla-central/source/netwerk/base/public/nsINetworkLinkService.idl + http://mxr.mozilla.org/mozilla-central/source/netwerk/base/nsINetworkLinkService.idl */ static public final int LINK_TYPE_UNKNOWN = 0; static public final int LINK_TYPE_ETHERNET = 1; static public final int LINK_TYPE_USB = 2; static public final int LINK_TYPE_WIFI = 3; static public final int LINK_TYPE_WIMAX = 4; static public final int LINK_TYPE_2G = 5; static public final int LINK_TYPE_3G = 6;
--- a/mobile/android/base/GeckoConnectivityReceiver.java +++ b/mobile/android/base/GeckoConnectivityReceiver.java @@ -11,17 +11,17 @@ import android.content.Intent; import android.content.IntentFilter; import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.util.Log; public class GeckoConnectivityReceiver extends BroadcastReceiver { /* * Keep the below constants in sync with - * http://mxr.mozilla.org/mozilla-central/source/netwerk/base/public/nsINetworkLinkService.idl + * http://mxr.mozilla.org/mozilla-central/source/netwerk/base/nsINetworkLinkService.idl */ private static final String LINK_DATA_UP = "up"; private static final String LINK_DATA_DOWN = "down"; private static final String LINK_DATA_CHANGED = "changed"; private static final String LINK_DATA_UNKNOWN = "unknown"; private static final String LOGTAG = "GeckoConnectivityReceiver";
--- a/modules/libpref/Makefile.in +++ b/modules/libpref/Makefile.in @@ -7,17 +7,17 @@ include $(topsrcdir)/config/rules.mk GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, \ mailnews.js editor.js \ aix.js unix.js winpref.js) GARBAGE += greprefs.js # TODO bug 813259 external files should be defined near their location in the source tree. -grepref_files = $(topsrcdir)/netwerk/base/public/security-prefs.js $(srcdir)/init/all.js +grepref_files = $(topsrcdir)/netwerk/base/security-prefs.js $(srcdir)/init/all.js ifdef MOZ_DATA_REPORTING grepref_files += $(topsrcdir)/services/datareporting/datareporting-prefs.js endif ifdef MOZ_SERVICES_HEALTHREPORT ifneq (android,$(MOZ_WIDGET_TOOLKIT)) grepref_files += $(topsrcdir)/services/healthreport/healthreport-prefs.js
rename from netwerk/base/src/ADivertableParentChannel.h rename to netwerk/base/ADivertableParentChannel.h
rename from netwerk/base/src/ArrayBufferInputStream.cpp rename to netwerk/base/ArrayBufferInputStream.cpp
rename from netwerk/base/src/ArrayBufferInputStream.h rename to netwerk/base/ArrayBufferInputStream.h
rename from netwerk/base/src/ChannelDiverterChild.cpp rename to netwerk/base/ChannelDiverterChild.cpp
rename from netwerk/base/src/ChannelDiverterParent.cpp rename to netwerk/base/ChannelDiverterParent.cpp
rename from netwerk/base/src/NetworkActivityMonitor.cpp rename to netwerk/base/NetworkActivityMonitor.cpp
rename from netwerk/base/src/NetworkActivityMonitor.h rename to netwerk/base/NetworkActivityMonitor.h
rename from netwerk/base/src/PrivateBrowsingChannel.h rename to netwerk/base/PrivateBrowsingChannel.h
rename from netwerk/base/src/RedirectChannelRegistrar.cpp rename to netwerk/base/RedirectChannelRegistrar.cpp
rename from netwerk/base/src/RedirectChannelRegistrar.h rename to netwerk/base/RedirectChannelRegistrar.h
rename from netwerk/base/src/StreamingProtocolService.cpp rename to netwerk/base/StreamingProtocolService.cpp
rename from netwerk/base/src/StreamingProtocolService.h rename to netwerk/base/StreamingProtocolService.h
--- a/netwerk/base/moz.build +++ b/netwerk/base/moz.build @@ -1,7 +1,284 @@ # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*- # vim: set filetype=python: # 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/. -DIRS += ['public', 'src'] +XPIDL_SOURCES += [ + 'mozIThirdPartyUtil.idl', + 'nsIApplicationCache.idl', + 'nsIApplicationCacheChannel.idl', + 'nsIApplicationCacheContainer.idl', + 'nsIApplicationCacheService.idl', + 'nsIArrayBufferInputStream.idl', + 'nsIAsyncStreamCopier.idl', + 'nsIAsyncStreamCopier2.idl', + 'nsIAsyncVerifyRedirectCallback.idl', + 'nsIAuthInformation.idl', + 'nsIAuthModule.idl', + 'nsIAuthPrompt.idl', + 'nsIAuthPrompt2.idl', + 'nsIAuthPromptAdapterFactory.idl', + 'nsIAuthPromptCallback.idl', + 'nsIAuthPromptProvider.idl', + 'nsIBackgroundFileSaver.idl', + 'nsIBufferedStreams.idl', + 'nsIByteRangeRequest.idl', + 'nsICacheInfoChannel.idl', + 'nsICachingChannel.idl', + 'nsICancelable.idl', + 'nsIChannel.idl', + 'nsIChannelEventSink.idl', + 'nsIChildChannel.idl', + 'nsIClassOfService.idl', + 'nsIContentSniffer.idl', + 'nsICryptoFIPSInfo.idl', + 'nsICryptoHash.idl', + 'nsICryptoHMAC.idl', + 'nsIDashboard.idl', + 'nsIDashboardEventNotifier.idl', + 'nsIDivertableChannel.idl', + 'nsIDownloader.idl', + 'nsIEncodedChannel.idl', + 'nsIExternalProtocolHandler.idl', + 'nsIFileStreams.idl', + 'nsIFileURL.idl', + 'nsIForcePendingChannel.idl', + 'nsIHttpPushListener.idl', + 'nsIIncrementalDownload.idl', + 'nsIInputStreamChannel.idl', + 'nsIInputStreamPump.idl', + 'nsIIOService.idl', + 'nsIIOService2.idl', + 'nsILoadContextInfo.idl', + 'nsILoadGroup.idl', + 'nsILoadGroupChild.idl', + 'nsIMIMEInputStream.idl', + 'nsIMultiPartChannel.idl', + 'nsINestedURI.idl', + 'nsINetAddr.idl', + 'nsINetUtil.idl', + 'nsINetworkInterceptController.idl', + 'nsINetworkLinkService.idl', + 'nsINetworkPredictor.idl', + 'nsINetworkPredictorVerifier.idl', + 'nsINetworkProperties.idl', + 'nsINSSErrorsService.idl', + 'nsINullChannel.idl', + 'nsIParentChannel.idl', + 'nsIParentRedirectingChannel.idl', + 'nsIPermission.idl', + 'nsIPermissionManager.idl', + 'nsIPrivateBrowsingChannel.idl', + 'nsIProgressEventSink.idl', + 'nsIPrompt.idl', + 'nsIProtocolHandler.idl', + 'nsIProtocolProxyCallback.idl', + 'nsIProtocolProxyFilter.idl', + 'nsIProtocolProxyService.idl', + 'nsIProtocolProxyService2.idl', + 'nsIProxiedChannel.idl', + 'nsIProxiedProtocolHandler.idl', + 'nsIProxyInfo.idl', + 'nsIRandomGenerator.idl', + 'nsIRedirectChannelRegistrar.idl', + 'nsIRedirectHistory.idl', + 'nsIRedirectResultListener.idl', + 'nsIRequest.idl', + 'nsIRequestObserver.idl', + 'nsIRequestObserverProxy.idl', + 'nsIResumableChannel.idl', + 'nsISecretDecoderRing.idl', + 'nsISecureBrowserUI.idl', + 'nsISecurityEventSink.idl', + 'nsISecurityInfoProvider.idl', + 'nsISerializationHelper.idl', + 'nsIServerSocket.idl', + 'nsISimpleStreamListener.idl', + 'nsISiteSecurityService.idl', + 'nsISocketTransport.idl', + 'nsISocketTransportService.idl', + 'nsISpeculativeConnect.idl', + 'nsIStandardURL.idl', + 'nsIStreamingProtocolController.idl', + 'nsIStreamingProtocolService.idl', + 'nsIStreamListener.idl', + 'nsIStreamListenerTee.idl', + 'nsIStreamLoader.idl', + 'nsIStreamTransportService.idl', + 'nsISyncStreamListener.idl', + 'nsISystemProxySettings.idl', + 'nsIThreadRetargetableRequest.idl', + 'nsIThreadRetargetableStreamListener.idl', + 'nsITimedChannel.idl', + 'nsITLSServerSocket.idl', + 'nsITraceableChannel.idl', + 'nsITransport.idl', + 'nsIUDPSocket.idl', + 'nsIUDPSocketFilter.idl', + 'nsIUnicharStreamLoader.idl', + 'nsIUploadChannel.idl', + 'nsIUploadChannel2.idl', + 'nsIURI.idl', + 'nsIURIChecker.idl', + 'nsIURIClassifier.idl', + 'nsIURIWithPrincipal.idl', + 'nsIURL.idl', + 'nsIURLParser.idl', + 'nsPILoadGroupInternal.idl', + 'nsPISocketTransportService.idl', +] + +if CONFIG['MOZ_TOOLKIT_SEARCH']: + XPIDL_SOURCES += [ + 'nsIBrowserSearchService.idl', + ] + +XPIDL_MODULE = 'necko' + +EXPORTS += [ + 'netCore.h', + 'nsASocketHandler.h', + 'nsAsyncRedirectVerifyHelper.h', + 'nsFileStreams.h', + 'nsMIMEInputStream.h', + 'nsNetUtil.h', + 'nsReadLine.h', + 'nsStreamListenerWrapper.h', + 'nsTemporaryFileInputStream.h', + 'nsURIHashKey.h', + 'nsURLHelper.h', + 'nsURLParsers.h', +] + +EXPORTS.mozilla.net += [ + 'ChannelDiverterChild.h', + 'ChannelDiverterParent.h', + 'Dashboard.h', + 'DashboardTypes.h', + 'OfflineObserver.h', + 'ReferrerPolicy.h', +] + +if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': + EXPORTS += [ + 'NetStatistics.h', + ] + +UNIFIED_SOURCES += [ + 'ArrayBufferInputStream.cpp', + 'BackgroundFileSaver.cpp', + 'ChannelDiverterChild.cpp', + 'ChannelDiverterParent.cpp', + 'Dashboard.cpp', + 'EventTokenBucket.cpp', + 'LoadContextInfo.cpp', + 'NetworkActivityMonitor.cpp', + 'nsAsyncRedirectVerifyHelper.cpp', + 'nsAsyncStreamCopier.cpp', + 'nsAuthInformationHolder.cpp', + 'nsBase64Encoder.cpp', + 'nsBaseChannel.cpp', + 'nsBaseContentStream.cpp', + 'nsBufferedStreams.cpp', + 'nsChannelClassifier.cpp', + 'nsDirectoryIndexStream.cpp', + 'nsDNSPrefetch.cpp', + 'nsDownloader.cpp', + 'nsFileStreams.cpp', + 'nsIncrementalDownload.cpp', + 'nsInputStreamChannel.cpp', + 'nsInputStreamPump.cpp', + 'nsIOService.cpp', + 'nsLoadGroup.cpp', + 'nsMediaFragmentURIParser.cpp', + 'nsMIMEInputStream.cpp', + 'nsNetAddr.cpp', + 'nsNetUtil.cpp', + 'nsPACMan.cpp', + 'nsPreloadedStream.cpp', + 'nsProtocolProxyService.cpp', + 'nsProxyInfo.cpp', + 'nsRequestObserverProxy.cpp', + 'nsSerializationHelper.cpp', + 'nsServerSocket.cpp', + 'nsSimpleNestedURI.cpp', + 'nsSimpleStreamListener.cpp', + 'nsSimpleURI.cpp', + 'nsSocketTransport2.cpp', + 'nsSocketTransportService2.cpp', + 'nsStandardURL.cpp', + 'nsStreamListenerTee.cpp', + 'nsStreamListenerWrapper.cpp', + 'nsStreamLoader.cpp', + 'nsStreamTransportService.cpp', + 'nsSyncStreamListener.cpp', + 'nsTemporaryFileInputStream.cpp', + 'nsTransportUtils.cpp', + 'nsUDPSocket.cpp', + 'nsUnicharStreamLoader.cpp', + 'nsURIChecker.cpp', + 'nsURLHelper.cpp', + 'nsURLParsers.cpp', + 'OfflineObserver.cpp', + 'Predictor.cpp', + 'ProxyAutoConfig.cpp', + 'RedirectChannelRegistrar.cpp', + 'StreamingProtocolService.cpp', + 'Tickler.cpp', + 'TLSServerSocket.cpp', +] + +if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': + SOURCES += [ + 'nsAutodialWin.cpp', + 'nsNativeConnectionHelper.cpp', + 'nsURLHelperWin.cpp', + ] +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': + SOURCES += [ + 'nsURLHelperOSX.cpp', + ] +else: + SOURCES += [ + 'nsURLHelperUnix.cpp', + ] + +if CONFIG['MOZ_ENABLE_QTNETWORK']: + SOURCES += [ + 'nsAutodialQt.cpp', + ] + +EXTRA_JS_MODULES += [ + 'NetUtil.jsm', +] + +FAIL_ON_WARNINGS = True + +MSVC_ENABLE_PGO = True + +include('/ipc/chromium/chromium-config.mozbuild') + +FINAL_LIBRARY = 'xul' + +LOCAL_INCLUDES += [ + '/dom/base', + '/netwerk/protocol/http' +] + +if 'rtsp' in CONFIG['NECKO_PROTOCOLS']: + LOCAL_INCLUDES += [ + '/netwerk/protocol/rtsp/controller', + '/netwerk/protocol/rtsp/rtsp', + ] + +if CONFIG['MOZ_ENABLE_QTNETWORK']: + LOCAL_INCLUDES += [ + '/netwerk/system/qt', + ] + +if CONFIG['ENABLE_TESTS']: + DEFINES['PREDICTOR_TESTS'] = True + +if CONFIG['MOZ_ENABLE_QTNETWORK']: + CXXFLAGS += CONFIG['MOZ_QT_CFLAGS']
rename from netwerk/base/public/mozIThirdPartyUtil.idl rename to netwerk/base/mozIThirdPartyUtil.idl
rename from netwerk/base/src/nsAsyncRedirectVerifyHelper.cpp rename to netwerk/base/nsAsyncRedirectVerifyHelper.cpp
rename from netwerk/base/public/nsAsyncRedirectVerifyHelper.h rename to netwerk/base/nsAsyncRedirectVerifyHelper.h
rename from netwerk/base/src/nsAuthInformationHolder.cpp rename to netwerk/base/nsAuthInformationHolder.cpp
rename from netwerk/base/src/nsAuthInformationHolder.h rename to netwerk/base/nsAuthInformationHolder.h
rename from netwerk/base/src/nsDirectoryIndexStream.cpp rename to netwerk/base/nsDirectoryIndexStream.cpp
rename from netwerk/base/src/nsDirectoryIndexStream.h rename to netwerk/base/nsDirectoryIndexStream.h
rename from netwerk/base/public/nsIApplicationCache.idl rename to netwerk/base/nsIApplicationCache.idl
rename from netwerk/base/public/nsIApplicationCacheChannel.idl rename to netwerk/base/nsIApplicationCacheChannel.idl
rename from netwerk/base/public/nsIApplicationCacheContainer.idl rename to netwerk/base/nsIApplicationCacheContainer.idl
rename from netwerk/base/public/nsIApplicationCacheService.idl rename to netwerk/base/nsIApplicationCacheService.idl
rename from netwerk/base/public/nsIArrayBufferInputStream.idl rename to netwerk/base/nsIArrayBufferInputStream.idl
rename from netwerk/base/public/nsIAsyncStreamCopier.idl rename to netwerk/base/nsIAsyncStreamCopier.idl
rename from netwerk/base/public/nsIAsyncStreamCopier2.idl rename to netwerk/base/nsIAsyncStreamCopier2.idl
rename from netwerk/base/public/nsIAsyncVerifyRedirectCallback.idl rename to netwerk/base/nsIAsyncVerifyRedirectCallback.idl
rename from netwerk/base/public/nsIAuthInformation.idl rename to netwerk/base/nsIAuthInformation.idl
rename from netwerk/base/public/nsIAuthPromptAdapterFactory.idl rename to netwerk/base/nsIAuthPromptAdapterFactory.idl
rename from netwerk/base/public/nsIAuthPromptCallback.idl rename to netwerk/base/nsIAuthPromptCallback.idl
rename from netwerk/base/public/nsIAuthPromptProvider.idl rename to netwerk/base/nsIAuthPromptProvider.idl
rename from netwerk/base/public/nsIBackgroundFileSaver.idl rename to netwerk/base/nsIBackgroundFileSaver.idl
rename from netwerk/base/public/nsIBrowserSearchService.idl rename to netwerk/base/nsIBrowserSearchService.idl
rename from netwerk/base/public/nsIBufferedStreams.idl rename to netwerk/base/nsIBufferedStreams.idl
rename from netwerk/base/public/nsIByteRangeRequest.idl rename to netwerk/base/nsIByteRangeRequest.idl
rename from netwerk/base/public/nsICacheInfoChannel.idl rename to netwerk/base/nsICacheInfoChannel.idl
rename from netwerk/base/public/nsIChannelEventSink.idl rename to netwerk/base/nsIChannelEventSink.idl
rename from netwerk/base/public/nsIDashboardEventNotifier.idl rename to netwerk/base/nsIDashboardEventNotifier.idl
rename from netwerk/base/public/nsIDivertableChannel.idl rename to netwerk/base/nsIDivertableChannel.idl
rename from netwerk/base/public/nsIExternalProtocolHandler.idl rename to netwerk/base/nsIExternalProtocolHandler.idl
rename from netwerk/base/public/nsIForcePendingChannel.idl rename to netwerk/base/nsIForcePendingChannel.idl
rename from netwerk/base/public/nsIHttpPushListener.idl rename to netwerk/base/nsIHttpPushListener.idl
rename from netwerk/base/public/nsIIncrementalDownload.idl rename to netwerk/base/nsIIncrementalDownload.idl
rename from netwerk/base/public/nsIInputStreamChannel.idl rename to netwerk/base/nsIInputStreamChannel.idl
rename from netwerk/base/public/nsIInputStreamPump.idl rename to netwerk/base/nsIInputStreamPump.idl
rename from netwerk/base/public/nsILoadContextInfo.idl rename to netwerk/base/nsILoadContextInfo.idl
rename from netwerk/base/public/nsIMIMEInputStream.idl rename to netwerk/base/nsIMIMEInputStream.idl
rename from netwerk/base/public/nsIMultiPartChannel.idl rename to netwerk/base/nsIMultiPartChannel.idl
rename from netwerk/base/public/nsINSSErrorsService.idl rename to netwerk/base/nsINSSErrorsService.idl
rename from netwerk/base/public/nsINetworkInterceptController.idl rename to netwerk/base/nsINetworkInterceptController.idl
rename from netwerk/base/public/nsINetworkLinkService.idl rename to netwerk/base/nsINetworkLinkService.idl
rename from netwerk/base/public/nsINetworkPredictor.idl rename to netwerk/base/nsINetworkPredictor.idl
rename from netwerk/base/public/nsINetworkPredictorVerifier.idl rename to netwerk/base/nsINetworkPredictorVerifier.idl
rename from netwerk/base/public/nsINetworkProperties.idl rename to netwerk/base/nsINetworkProperties.idl
rename from netwerk/base/public/nsIParentRedirectingChannel.idl rename to netwerk/base/nsIParentRedirectingChannel.idl
rename from netwerk/base/public/nsIPermissionManager.idl rename to netwerk/base/nsIPermissionManager.idl
rename from netwerk/base/public/nsIPrivateBrowsingChannel.idl rename to netwerk/base/nsIPrivateBrowsingChannel.idl
rename from netwerk/base/public/nsIProgressEventSink.idl rename to netwerk/base/nsIProgressEventSink.idl
rename from netwerk/base/public/nsIProtocolHandler.idl rename to netwerk/base/nsIProtocolHandler.idl
rename from netwerk/base/public/nsIProtocolProxyCallback.idl rename to netwerk/base/nsIProtocolProxyCallback.idl
rename from netwerk/base/public/nsIProtocolProxyFilter.idl rename to netwerk/base/nsIProtocolProxyFilter.idl
rename from netwerk/base/public/nsIProtocolProxyService.idl rename to netwerk/base/nsIProtocolProxyService.idl
rename from netwerk/base/public/nsIProtocolProxyService2.idl rename to netwerk/base/nsIProtocolProxyService2.idl
rename from netwerk/base/public/nsIProxiedProtocolHandler.idl rename to netwerk/base/nsIProxiedProtocolHandler.idl
rename from netwerk/base/public/nsIRandomGenerator.idl rename to netwerk/base/nsIRandomGenerator.idl
rename from netwerk/base/public/nsIRedirectChannelRegistrar.idl rename to netwerk/base/nsIRedirectChannelRegistrar.idl
rename from netwerk/base/public/nsIRedirectHistory.idl rename to netwerk/base/nsIRedirectHistory.idl
rename from netwerk/base/public/nsIRedirectResultListener.idl rename to netwerk/base/nsIRedirectResultListener.idl
rename from netwerk/base/public/nsIRequestObserver.idl rename to netwerk/base/nsIRequestObserver.idl
rename from netwerk/base/public/nsIRequestObserverProxy.idl rename to netwerk/base/nsIRequestObserverProxy.idl
rename from netwerk/base/public/nsIResumableChannel.idl rename to netwerk/base/nsIResumableChannel.idl
rename from netwerk/base/public/nsISecretDecoderRing.idl rename to netwerk/base/nsISecretDecoderRing.idl
rename from netwerk/base/public/nsISecureBrowserUI.idl rename to netwerk/base/nsISecureBrowserUI.idl
rename from netwerk/base/public/nsISecurityEventSink.idl rename to netwerk/base/nsISecurityEventSink.idl
rename from netwerk/base/public/nsISecurityInfoProvider.idl rename to netwerk/base/nsISecurityInfoProvider.idl
rename from netwerk/base/public/nsISerializationHelper.idl rename to netwerk/base/nsISerializationHelper.idl
rename from netwerk/base/public/nsISimpleStreamListener.idl rename to netwerk/base/nsISimpleStreamListener.idl
rename from netwerk/base/public/nsISiteSecurityService.idl rename to netwerk/base/nsISiteSecurityService.idl
rename from netwerk/base/public/nsISocketTransport.idl rename to netwerk/base/nsISocketTransport.idl
rename from netwerk/base/public/nsISocketTransportService.idl rename to netwerk/base/nsISocketTransportService.idl
rename from netwerk/base/public/nsISpeculativeConnect.idl rename to netwerk/base/nsISpeculativeConnect.idl
rename from netwerk/base/public/nsIStreamListenerTee.idl rename to netwerk/base/nsIStreamListenerTee.idl
rename from netwerk/base/public/nsIStreamTransportService.idl rename to netwerk/base/nsIStreamTransportService.idl
rename from netwerk/base/public/nsIStreamingProtocolController.idl rename to netwerk/base/nsIStreamingProtocolController.idl
rename from netwerk/base/public/nsIStreamingProtocolService.idl rename to netwerk/base/nsIStreamingProtocolService.idl
rename from netwerk/base/public/nsISyncStreamListener.idl rename to netwerk/base/nsISyncStreamListener.idl
rename from netwerk/base/public/nsISystemProxySettings.idl rename to netwerk/base/nsISystemProxySettings.idl
rename from netwerk/base/public/nsITLSServerSocket.idl rename to netwerk/base/nsITLSServerSocket.idl
rename from netwerk/base/public/nsIThreadRetargetableRequest.idl rename to netwerk/base/nsIThreadRetargetableRequest.idl
rename from netwerk/base/public/nsIThreadRetargetableStreamListener.idl rename to netwerk/base/nsIThreadRetargetableStreamListener.idl
rename from netwerk/base/public/nsITraceableChannel.idl rename to netwerk/base/nsITraceableChannel.idl
rename from netwerk/base/public/nsIUDPSocketFilter.idl rename to netwerk/base/nsIUDPSocketFilter.idl
rename from netwerk/base/public/nsIURIWithPrincipal.idl rename to netwerk/base/nsIURIWithPrincipal.idl
rename from netwerk/base/public/nsIUnicharStreamLoader.idl rename to netwerk/base/nsIUnicharStreamLoader.idl
rename from netwerk/base/src/nsIncrementalDownload.cpp rename to netwerk/base/nsIncrementalDownload.cpp
rename from netwerk/base/src/nsInputStreamChannel.cpp rename to netwerk/base/nsInputStreamChannel.cpp
rename from netwerk/base/src/nsMediaFragmentURIParser.cpp rename to netwerk/base/nsMediaFragmentURIParser.cpp
rename from netwerk/base/src/nsMediaFragmentURIParser.h rename to netwerk/base/nsMediaFragmentURIParser.h
rename from netwerk/base/src/nsNativeConnectionHelper.cpp rename to netwerk/base/nsNativeConnectionHelper.cpp
rename from netwerk/base/src/nsNativeConnectionHelper.h rename to netwerk/base/nsNativeConnectionHelper.h
rename from netwerk/base/public/nsPILoadGroupInternal.idl rename to netwerk/base/nsPILoadGroupInternal.idl
rename from netwerk/base/public/nsPISocketTransportService.idl rename to netwerk/base/nsPISocketTransportService.idl
rename from netwerk/base/src/nsProtocolProxyService.cpp rename to netwerk/base/nsProtocolProxyService.cpp
rename from netwerk/base/src/nsProtocolProxyService.h rename to netwerk/base/nsProtocolProxyService.h
rename from netwerk/base/src/nsRequestObserverProxy.cpp rename to netwerk/base/nsRequestObserverProxy.cpp
rename from netwerk/base/src/nsRequestObserverProxy.h rename to netwerk/base/nsRequestObserverProxy.h
rename from netwerk/base/src/nsSerializationHelper.cpp rename to netwerk/base/nsSerializationHelper.cpp
rename from netwerk/base/src/nsSimpleStreamListener.cpp rename to netwerk/base/nsSimpleStreamListener.cpp
rename from netwerk/base/src/nsSimpleStreamListener.h rename to netwerk/base/nsSimpleStreamListener.h
rename from netwerk/base/src/nsSocketTransportService2.cpp rename to netwerk/base/nsSocketTransportService2.cpp
rename from netwerk/base/src/nsSocketTransportService2.h rename to netwerk/base/nsSocketTransportService2.h
rename from netwerk/base/src/nsStreamListenerWrapper.cpp rename to netwerk/base/nsStreamListenerWrapper.cpp
rename from netwerk/base/public/nsStreamListenerWrapper.h rename to netwerk/base/nsStreamListenerWrapper.h
rename from netwerk/base/src/nsStreamTransportService.cpp rename to netwerk/base/nsStreamTransportService.cpp
rename from netwerk/base/src/nsStreamTransportService.h rename to netwerk/base/nsStreamTransportService.h
rename from netwerk/base/src/nsSyncStreamListener.cpp rename to netwerk/base/nsSyncStreamListener.cpp
rename from netwerk/base/src/nsTemporaryFileInputStream.cpp rename to netwerk/base/nsTemporaryFileInputStream.cpp
rename from netwerk/base/src/nsTemporaryFileInputStream.h rename to netwerk/base/nsTemporaryFileInputStream.h
rename from netwerk/base/src/nsUnicharStreamLoader.cpp rename to netwerk/base/nsUnicharStreamLoader.cpp
deleted file mode 100644 --- a/netwerk/base/public/moz.build +++ /dev/null @@ -1,159 +0,0 @@ -# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python: -# 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/. - -XPIDL_SOURCES += [ - 'mozIThirdPartyUtil.idl', - 'nsIApplicationCache.idl', - 'nsIApplicationCacheChannel.idl', - 'nsIApplicationCacheContainer.idl', - 'nsIApplicationCacheService.idl', - 'nsIArrayBufferInputStream.idl', - 'nsIAsyncStreamCopier.idl', - 'nsIAsyncStreamCopier2.idl', - 'nsIAsyncVerifyRedirectCallback.idl', - 'nsIAuthInformation.idl', - 'nsIAuthModule.idl', - 'nsIAuthPrompt.idl', - 'nsIAuthPrompt2.idl', - 'nsIAuthPromptAdapterFactory.idl', - 'nsIAuthPromptCallback.idl', - 'nsIAuthPromptProvider.idl', - 'nsIBackgroundFileSaver.idl', - 'nsIBufferedStreams.idl', - 'nsIByteRangeRequest.idl', - 'nsICacheInfoChannel.idl', - 'nsICachingChannel.idl', - 'nsICancelable.idl', - 'nsIChannel.idl', - 'nsIChannelEventSink.idl', - 'nsIChildChannel.idl', - 'nsIClassOfService.idl', - 'nsIContentSniffer.idl', - 'nsICryptoFIPSInfo.idl', - 'nsICryptoHash.idl', - 'nsICryptoHMAC.idl', - 'nsIDashboard.idl', - 'nsIDashboardEventNotifier.idl', - 'nsIDivertableChannel.idl', - 'nsIDownloader.idl', - 'nsIEncodedChannel.idl', - 'nsIExternalProtocolHandler.idl', - 'nsIFileStreams.idl', - 'nsIFileURL.idl', - 'nsIForcePendingChannel.idl', - 'nsIHttpPushListener.idl', - 'nsIIncrementalDownload.idl', - 'nsIInputStreamChannel.idl', - 'nsIInputStreamPump.idl', - 'nsIIOService.idl', - 'nsIIOService2.idl', - 'nsILoadContextInfo.idl', - 'nsILoadGroup.idl', - 'nsILoadGroupChild.idl', - 'nsIMIMEInputStream.idl', - 'nsIMultiPartChannel.idl', - 'nsINestedURI.idl', - 'nsINetAddr.idl', - 'nsINetUtil.idl', - 'nsINetworkInterceptController.idl', - 'nsINetworkLinkService.idl', - 'nsINetworkPredictor.idl', - 'nsINetworkPredictorVerifier.idl', - 'nsINetworkProperties.idl', - 'nsINSSErrorsService.idl', - 'nsINullChannel.idl', - 'nsIParentChannel.idl', - 'nsIParentRedirectingChannel.idl', - 'nsIPermission.idl', - 'nsIPermissionManager.idl', - 'nsIPrivateBrowsingChannel.idl', - 'nsIProgressEventSink.idl', - 'nsIPrompt.idl', - 'nsIProtocolHandler.idl', - 'nsIProtocolProxyCallback.idl', - 'nsIProtocolProxyFilter.idl', - 'nsIProtocolProxyService.idl', - 'nsIProtocolProxyService2.idl', - 'nsIProxiedChannel.idl', - 'nsIProxiedProtocolHandler.idl', - 'nsIProxyInfo.idl', - 'nsIRandomGenerator.idl', - 'nsIRedirectChannelRegistrar.idl', - 'nsIRedirectHistory.idl', - 'nsIRedirectResultListener.idl', - 'nsIRequest.idl', - 'nsIRequestObserver.idl', - 'nsIRequestObserverProxy.idl', - 'nsIResumableChannel.idl', - 'nsISecretDecoderRing.idl', - 'nsISecureBrowserUI.idl', - 'nsISecurityEventSink.idl', - 'nsISecurityInfoProvider.idl', - 'nsISerializationHelper.idl', - 'nsIServerSocket.idl', - 'nsISimpleStreamListener.idl', - 'nsISiteSecurityService.idl', - 'nsISocketTransport.idl', - 'nsISocketTransportService.idl', - 'nsISpeculativeConnect.idl', - 'nsIStandardURL.idl', - 'nsIStreamingProtocolController.idl', - 'nsIStreamingProtocolService.idl', - 'nsIStreamListener.idl', - 'nsIStreamListenerTee.idl', - 'nsIStreamLoader.idl', - 'nsIStreamTransportService.idl', - 'nsISyncStreamListener.idl', - 'nsISystemProxySettings.idl', - 'nsIThreadRetargetableRequest.idl', - 'nsIThreadRetargetableStreamListener.idl', - 'nsITimedChannel.idl', - 'nsITLSServerSocket.idl', - 'nsITraceableChannel.idl', - 'nsITransport.idl', - 'nsIUDPSocket.idl', - 'nsIUDPSocketFilter.idl', - 'nsIUnicharStreamLoader.idl', - 'nsIUploadChannel.idl', - 'nsIUploadChannel2.idl', - 'nsIURI.idl', - 'nsIURIChecker.idl', - 'nsIURIClassifier.idl', - 'nsIURIWithPrincipal.idl', - 'nsIURL.idl', - 'nsIURLParser.idl', - 'nsPILoadGroupInternal.idl', - 'nsPISocketTransportService.idl', -] - -if CONFIG['MOZ_TOOLKIT_SEARCH']: - XPIDL_SOURCES += [ - 'nsIBrowserSearchService.idl', - ] - -XPIDL_MODULE = 'necko' - -EXPORTS += [ - 'netCore.h', - 'nsASocketHandler.h', - 'nsAsyncRedirectVerifyHelper.h', - 'nsNetUtil.h', - 'nsReadLine.h', - 'nsStreamListenerWrapper.h', - 'nsURIHashKey.h', -] - -EXPORTS.mozilla.net += [ - 'ReferrerPolicy.h', -] - -if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': - EXPORTS += [ - 'NetStatistics.h', - ] - -FAIL_ON_WARNINGS = True -
deleted file mode 100644 --- a/netwerk/base/src/moz.build +++ /dev/null @@ -1,138 +0,0 @@ -# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python: -# 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/. - -EXPORTS += [ - 'nsFileStreams.h', - 'nsMIMEInputStream.h', - 'nsTemporaryFileInputStream.h', - 'nsURLHelper.h', - 'nsURLParsers.h', -] - -EXPORTS.mozilla.net += [ - 'ChannelDiverterChild.h', - 'ChannelDiverterParent.h', - 'Dashboard.h', - 'DashboardTypes.h', - 'OfflineObserver.h', -] - -UNIFIED_SOURCES += [ - 'ArrayBufferInputStream.cpp', - 'BackgroundFileSaver.cpp', - 'ChannelDiverterChild.cpp', - 'ChannelDiverterParent.cpp', - 'Dashboard.cpp', - 'EventTokenBucket.cpp', - 'LoadContextInfo.cpp', - 'NetworkActivityMonitor.cpp', - 'nsAsyncRedirectVerifyHelper.cpp', - 'nsAsyncStreamCopier.cpp', - 'nsAuthInformationHolder.cpp', - 'nsBase64Encoder.cpp', - 'nsBaseChannel.cpp', - 'nsBaseContentStream.cpp', - 'nsBufferedStreams.cpp', - 'nsChannelClassifier.cpp', - 'nsDirectoryIndexStream.cpp', - 'nsDNSPrefetch.cpp', - 'nsDownloader.cpp', - 'nsFileStreams.cpp', - 'nsIncrementalDownload.cpp', - 'nsInputStreamChannel.cpp', - 'nsInputStreamPump.cpp', - 'nsIOService.cpp', - 'nsLoadGroup.cpp', - 'nsMediaFragmentURIParser.cpp', - 'nsMIMEInputStream.cpp', - 'nsNetAddr.cpp', - 'nsNetUtil.cpp', - 'nsPACMan.cpp', - 'nsPreloadedStream.cpp', - 'nsProtocolProxyService.cpp', - 'nsProxyInfo.cpp', - 'nsRequestObserverProxy.cpp', - 'nsSerializationHelper.cpp', - 'nsServerSocket.cpp', - 'nsSimpleNestedURI.cpp', - 'nsSimpleStreamListener.cpp', - 'nsSimpleURI.cpp', - 'nsSocketTransport2.cpp', - 'nsSocketTransportService2.cpp', - 'nsStandardURL.cpp', - 'nsStreamListenerTee.cpp', - 'nsStreamListenerWrapper.cpp', - 'nsStreamLoader.cpp', - 'nsStreamTransportService.cpp', - 'nsSyncStreamListener.cpp', - 'nsTemporaryFileInputStream.cpp', - 'nsTransportUtils.cpp', - 'nsUDPSocket.cpp', - 'nsUnicharStreamLoader.cpp', - 'nsURIChecker.cpp', - 'nsURLHelper.cpp', - 'nsURLParsers.cpp', - 'OfflineObserver.cpp', - 'Predictor.cpp', - 'ProxyAutoConfig.cpp', - 'RedirectChannelRegistrar.cpp', - 'StreamingProtocolService.cpp', - 'Tickler.cpp', - 'TLSServerSocket.cpp', -] - -if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': - SOURCES += [ - 'nsAutodialWin.cpp', - 'nsNativeConnectionHelper.cpp', - 'nsURLHelperWin.cpp', - ] -elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': - SOURCES += [ - 'nsURLHelperOSX.cpp', - ] -else: - SOURCES += [ - 'nsURLHelperUnix.cpp', - ] - -if CONFIG['MOZ_ENABLE_QTNETWORK']: - SOURCES += [ - 'nsAutodialQt.cpp', - ] - -EXTRA_JS_MODULES += [ - 'NetUtil.jsm', -] - -FAIL_ON_WARNINGS = True - -MSVC_ENABLE_PGO = True - -include('/ipc/chromium/chromium-config.mozbuild') - -FINAL_LIBRARY = 'xul' -LOCAL_INCLUDES += [ - '/dom/base', - '/netwerk/protocol/http' -] - -if 'rtsp' in CONFIG['NECKO_PROTOCOLS']: - LOCAL_INCLUDES += [ - '/netwerk/protocol/rtsp/controller', - '/netwerk/protocol/rtsp/rtsp', - ] - -if CONFIG['MOZ_ENABLE_QTNETWORK']: - LOCAL_INCLUDES += [ - '/netwerk/system/qt', - ] - -if CONFIG['ENABLE_TESTS']: - DEFINES['PREDICTOR_TESTS'] = True - -if CONFIG['MOZ_ENABLE_QTNETWORK']: - CXXFLAGS += CONFIG['MOZ_QT_CFLAGS']
--- a/netwerk/build/moz.build +++ b/netwerk/build/moz.build @@ -16,17 +16,17 @@ FAIL_ON_WARNINGS = True MSVC_ENABLE_PGO = True include('/ipc/chromium/chromium-config.mozbuild') FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ - '../base/src', + '../base', '../cache', '../dns', '../mime', '../protocol/about', '../protocol/app', '../socket', '../streamconv/converters', '../streamconv/src',
--- a/netwerk/cache/moz.build +++ b/netwerk/cache/moz.build @@ -43,10 +43,10 @@ UNIFIED_SOURCES += [ FAIL_ON_WARNINGS = True MSVC_ENABLE_PGO = True FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ - '../base/src', + '../base', ]
--- a/netwerk/cache2/moz.build +++ b/netwerk/cache2/moz.build @@ -43,17 +43,17 @@ UNIFIED_SOURCES += [ ] # AppCacheStorage.cpp cannot be built in unified mode because it uses plarena.h. SOURCES += [ 'AppCacheStorage.cpp', ] LOCAL_INCLUDES += [ - '../base/src', + '../base', '../cache', ] FAIL_ON_WARNINGS = True MSVC_ENABLE_PGO = True FINAL_LIBRARY = 'xul'
--- a/netwerk/dns/moz.build +++ b/netwerk/dns/moz.build @@ -57,10 +57,10 @@ include('/ipc/chromium/chromium-config.m FINAL_LIBRARY = 'xul' GENERATED_FILES = [ 'etld_data.inc', ] # need to include etld_data.inc LOCAL_INCLUDES += [ - '../base/src', + '../base', ]
--- a/netwerk/ipc/moz.build +++ b/netwerk/ipc/moz.build @@ -40,13 +40,13 @@ IPDL_SOURCES = [ FAIL_ON_WARNINGS = True include('/ipc/chromium/chromium-config.mozbuild') FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ - '../base/src', + '../base', '../protocol/http', '/caps', '/modules/libjar', ]
--- a/netwerk/protocol/about/moz.build +++ b/netwerk/protocol/about/moz.build @@ -24,11 +24,11 @@ UNIFIED_SOURCES += [ FAIL_ON_WARNINGS = True include('/ipc/chromium/chromium-config.mozbuild') FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ - '../../base/src', + '../../base', '../../cache2', ]
--- a/netwerk/protocol/app/moz.build +++ b/netwerk/protocol/app/moz.build @@ -8,12 +8,12 @@ SOURCES += [ 'AppProtocolHandler.cpp', ] FAIL_ON_WARNINGS = True FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ '../../../modules/libjar', - '../../base/src', + '../../base', '/caps', ]
--- a/netwerk/protocol/data/moz.build +++ b/netwerk/protocol/data/moz.build @@ -8,11 +8,11 @@ UNIFIED_SOURCES += [ 'nsDataChannel.cpp', 'nsDataHandler.cpp', ] FAIL_ON_WARNINGS = True FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ - '../../base/src', + '../../base', ]
--- a/netwerk/protocol/device/moz.build +++ b/netwerk/protocol/device/moz.build @@ -20,10 +20,10 @@ UNIFIED_SOURCES += [ FAIL_ON_WARNINGS = True include('/ipc/chromium/chromium-config.mozbuild') FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ - '../../base/src/', + '../../base/', ]
--- a/netwerk/protocol/file/moz.build +++ b/netwerk/protocol/file/moz.build @@ -18,10 +18,10 @@ UNIFIED_SOURCES += [ FAIL_ON_WARNINGS = True MSVC_ENABLE_PGO = True FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ - '../../base/src', + '../../base', ]
--- a/netwerk/protocol/ftp/moz.build +++ b/netwerk/protocol/ftp/moz.build @@ -36,10 +36,10 @@ FAIL_ON_WARNINGS = True MSVC_ENABLE_PGO = True include('/ipc/chromium/chromium-config.mozbuild') FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ - '../../base/src', + '../../base', ]
--- a/netwerk/protocol/http/moz.build +++ b/netwerk/protocol/http/moz.build @@ -103,11 +103,11 @@ FAIL_ON_WARNINGS = True MSVC_ENABLE_PGO = True include('/ipc/chromium/chromium-config.mozbuild') FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ - '../../base/src', + '../../base', '/dom/base', ]
--- a/netwerk/protocol/http/nsHttpHandler.h +++ b/netwerk/protocol/http/nsHttpHandler.h @@ -493,17 +493,17 @@ private: // The maximum amount of time to wait for socket transport to be // established. In milliseconds. uint32_t mConnectTimeout; // The maximum number of current global half open sockets allowable // when starting a new speculative connection. uint32_t mParallelSpeculativeConnectLimit; - // For Rate Pacing of HTTP/1 requests through a netwerk/base/src/EventTokenBucket + // For Rate Pacing of HTTP/1 requests through a netwerk/base/EventTokenBucket // Active requests <= *MinParallelism are not subject to the rate pacing bool mRequestTokenBucketEnabled; uint16_t mRequestTokenBucketMinParallelism; uint32_t mRequestTokenBucketHz; // EventTokenBucket HZ uint32_t mRequestTokenBucketBurst; // EventTokenBucket Burst // Whether or not to block requests for non head js/css items (e.g. media) // while those elements load.
--- a/netwerk/protocol/res/moz.build +++ b/netwerk/protocol/res/moz.build @@ -18,10 +18,10 @@ FAIL_ON_WARNINGS = True MSVC_ENABLE_PGO = True include('/ipc/chromium/chromium-config.mozbuild') FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ - '/netwerk/base/src', + '/netwerk/base', ]
--- a/netwerk/protocol/rtsp/moz.build +++ b/netwerk/protocol/rtsp/moz.build @@ -55,17 +55,17 @@ if CONFIG['GNU_CC']: CXXFLAGS += ['-Wno-error=attributes'] FINAL_LIBRARY = 'xul' DEFINES['IMPL_NS_NET'] = True DEFINES['FORCE_PR_LOG'] = True LOCAL_INCLUDES += [ - '../../base/src', + '../../base', '/dom/base', 'controller', 'rtsp', ] for var in ('IMPL_NS_NET', 'FORCE_PR_LOG'): DEFINES[var] = True
--- a/netwerk/protocol/viewsource/moz.build +++ b/netwerk/protocol/viewsource/moz.build @@ -14,11 +14,11 @@ UNIFIED_SOURCES += [ 'nsViewSourceChannel.cpp', 'nsViewSourceHandler.cpp', ] FAIL_ON_WARNINGS = True FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ - '../../base/src', + '../../base', ]
--- a/netwerk/protocol/websocket/moz.build +++ b/netwerk/protocol/websocket/moz.build @@ -35,11 +35,11 @@ FAIL_ON_WARNINGS = True MSVC_ENABLE_PGO = True include('/ipc/chromium/chromium-config.mozbuild') FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ - '../../base/src', + '../../base', '/dom/base', ]
--- a/netwerk/protocol/wyciwyg/moz.build +++ b/netwerk/protocol/wyciwyg/moz.build @@ -31,10 +31,10 @@ IPDL_SOURCES += [ FAIL_ON_WARNINGS = True include('/ipc/chromium/chromium-config.mozbuild') FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ - '../../base/src', + '../../base', ]
--- a/netwerk/sctp/src/moz.build +++ b/netwerk/sctp/src/moz.build @@ -41,17 +41,17 @@ if CONFIG['OS_TARGET'] == 'Android': Library('nksctp_s') include('/ipc/chromium/chromium-config.mozbuild') FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ - '../../base/src', + '../../base', '/dom/base', ] for var in ('SCTP_SIMPLE_ALLOCATOR', 'SCTP_PROCESS_LEVEL_LOCKS', '__Userspace__', 'INET', 'CALLBACK_API', 'SCTP_DEBUG'): DEFINES[var] = 1
--- a/netwerk/streamconv/converters/moz.build +++ b/netwerk/streamconv/converters/moz.build @@ -28,10 +28,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'coco FAIL_ON_WARNINGS = True MSVC_ENABLE_PGO = True FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ - '/netwerk/base/src', + '/netwerk/base', ]
--- a/netwerk/system/android/moz.build +++ b/netwerk/system/android/moz.build @@ -7,11 +7,11 @@ SOURCES += [ 'nsAndroidNetworkLinkService.cpp', ] FAIL_ON_WARNINGS = True FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ - '../../base/src', + '../../base', ]
--- a/netwerk/system/qt/moz.build +++ b/netwerk/system/qt/moz.build @@ -12,12 +12,12 @@ SOURCES += [ GENERATED_SOURCES += [ 'moc_nsQtNetworkManager.cpp', ] FAIL_ON_WARNINGS = True FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ - '../../base/src', + '../../base', ] CXXFLAGS += CONFIG['MOZ_QT_CFLAGS']
--- a/toolkit/components/url-classifier/nsCheckSummedOutputStream.h +++ b/toolkit/components/url-classifier/nsCheckSummedOutputStream.h @@ -7,17 +7,17 @@ #define nsCheckSummedOutputStream_h__ #include "nsILocalFile.h" #include "nsIFile.h" #include "nsIOutputStream.h" #include "nsICryptoHash.h" #include "nsNetCID.h" #include "nsString.h" -#include "../../../netwerk/base/src/nsFileStreams.h" +#include "../../../netwerk/base/nsFileStreams.h" #include "nsToolkitCompsCID.h" class nsCheckSummedOutputStream : public nsSafeFileOutputStream { public: NS_DECL_ISUPPORTS_INHERITED // Size of MD5 hash in bytes
--- a/uriloader/exthandler/moz.build +++ b/uriloader/exthandler/moz.build @@ -121,17 +121,17 @@ FAIL_ON_WARNINGS = True include('/ipc/chromium/chromium-config.mozbuild') FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ '/dom/base', '/dom/ipc', - '/netwerk/base/src', + '/netwerk/base', '/netwerk/protocol/http', ] if CONFIG['MOZ_ENABLE_DBUS']: CXXFLAGS += CONFIG['TK_CFLAGS'] CXXFLAGS += CONFIG['MOZ_DBUS_CFLAGS'] if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('qt', 'gtk2', 'gtk3'):
--- a/widget/android/moz.build +++ b/widget/android/moz.build @@ -51,15 +51,15 @@ FAIL_ON_WARNINGS = True include('/ipc/chromium/chromium-config.mozbuild') FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ '/docshell/base', '/dom/base', '/dom/system/android', - '/netwerk/base/src', + '/netwerk/base', '/netwerk/cache', '/widget', '/widget/android/android', ] #DEFINES['DEBUG_WIDGETS'] = True