CLOSED TREE - Bug 1109910 - Move LoadInfo from docShell into Necko (r=sicking,sworkman)
☠☠ backed out by dd8e580f0e1d ☠ ☠
authorChristoph Kerschbaumer <mozilla@christophkerschbaumer.com>
Tue, 17 Feb 2015 19:53:06 -0800
changeset 256819 73e586b9f04ff542c1c948c9216e56bdef3c2504
parent 256818 4c5c681a610412fb8a2b0421ae4a527795e261cd
child 256820 dd8e580f0e1d20d4cc90a923673b106ce3175fd4
push id4610
push userjlund@mozilla.com
push dateMon, 30 Mar 2015 18:32:55 +0000
treeherdermozilla-beta@4df54044d9ef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssicking, sworkman
bugs1109910
milestone38.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
CLOSED TREE - Bug 1109910 - Move LoadInfo from docShell into Necko (r=sicking,sworkman)
CLOBBER
docshell/base/LoadInfo.cpp
docshell/base/LoadInfo.h
docshell/base/moz.build
docshell/base/nsILoadInfo.idl
netwerk/base/LoadInfo.cpp
netwerk/base/LoadInfo.h
netwerk/base/moz.build
netwerk/base/nsILoadInfo.idl
--- a/CLOBBER
+++ b/CLOBBER
@@ -17,9 +17,9 @@
 #
 # Modifying this file will now automatically clobber the buildbot machines \o/
 #
 
 # Are you updating CLOBBER because you think it's needed for your WebIDL
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Bug 879861 - Touch CLOBBER because adding a new IDL is a crapshoot these days.
+Bug 1109910 - Touch CLOBBER because moving an IDL caused build bustage
--- a/docshell/base/moz.build
+++ b/docshell/base/moz.build
@@ -15,17 +15,16 @@ XPIDL_SOURCES += [
     'nsIDocShell.idl',
     'nsIDocShellLoadInfo.idl',
     'nsIDocShellTreeItem.idl',
     'nsIDocShellTreeOwner.idl',
     'nsIDocumentLoaderFactory.idl',
     'nsIDownloadHistory.idl',
     'nsIGlobalHistory2.idl',
     'nsILoadContext.idl',
-    'nsILoadInfo.idl',
     'nsIPrivacyTransitionObserver.idl',
     'nsIReflowObserver.idl',
     'nsIRefreshURI.idl',
     'nsIScrollable.idl',
     'nsITextScroll.idl',
     'nsIURIFixup.idl',
     'nsIWebNavigation.idl',
     'nsIWebNavigationInfo.idl',
@@ -40,22 +39,20 @@ EXPORTS += [
     'nsIScrollObserver.h',
     'nsIWebShellServices.h',
     'SerializedLoadContext.h',
 ]
 
 EXPORTS.mozilla += [
     'IHistory.h',
     'LoadContext.h',
-    'LoadInfo.h',
 ]
 
 UNIFIED_SOURCES += [
     'LoadContext.cpp',
-    'LoadInfo.cpp',
     'nsAboutRedirector.cpp',
     'nsDefaultURIFixup.cpp',
     'nsDocShell.cpp',
     'nsDocShellEditorData.cpp',
     'nsDocShellEnumerator.cpp',
     'nsDocShellLoadInfo.cpp',
     'nsDocShellTransferableHooks.cpp',
     'nsDownloadHistory.cpp',
rename from docshell/base/LoadInfo.cpp
rename to netwerk/base/LoadInfo.cpp
rename from docshell/base/LoadInfo.h
rename to netwerk/base/LoadInfo.h
--- a/netwerk/base/moz.build
+++ b/netwerk/base/moz.build
@@ -48,16 +48,17 @@ XPIDL_SOURCES += [
     'nsIIncrementalDownload.idl',
     'nsIInputStreamChannel.idl',
     'nsIInputStreamPump.idl',
     'nsIIOService.idl',
     'nsIIOService2.idl',
     'nsILoadContextInfo.idl',
     'nsILoadGroup.idl',
     'nsILoadGroupChild.idl',
+    'nsILoadInfo.idl',
     'nsIMIMEInputStream.idl',
     'nsIMultiPartChannel.idl',
     'nsINestedURI.idl',
     'nsINetAddr.idl',
     'nsINetUtil.idl',
     'nsINetworkInterceptController.idl',
     'nsINetworkLinkService.idl',
     'nsINetworkPredictor.idl',
@@ -147,16 +148,20 @@ EXPORTS += [
     'nsReadLine.h',
     'nsStreamListenerWrapper.h',
     'nsTemporaryFileInputStream.h',
     'nsURIHashKey.h',
     'nsURLHelper.h',
     'nsURLParsers.h',
 ]
 
+EXPORTS.mozilla += [
+    'LoadInfo.h',
+]
+
 EXPORTS.mozilla.net += [
     'ChannelDiverterChild.h',
     'ChannelDiverterParent.h',
     'Dashboard.h',
     'DashboardTypes.h',
     'OfflineObserver.h',
     'ReferrerPolicy.h',
 ]
@@ -169,16 +174,17 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk
 UNIFIED_SOURCES += [
     'ArrayBufferInputStream.cpp',
     'BackgroundFileSaver.cpp',
     'ChannelDiverterChild.cpp',
     'ChannelDiverterParent.cpp',
     'Dashboard.cpp',
     'EventTokenBucket.cpp',
     'LoadContextInfo.cpp',
+    'LoadInfo.cpp',
     'NetworkActivityMonitor.cpp',
     'nsAsyncRedirectVerifyHelper.cpp',
     'nsAsyncStreamCopier.cpp',
     'nsAuthInformationHolder.cpp',
     'nsBase64Encoder.cpp',
     'nsBaseChannel.cpp',
     'nsBaseContentStream.cpp',
     'nsBufferedStreams.cpp',
rename from docshell/base/nsILoadInfo.idl
rename to netwerk/base/nsILoadInfo.idl