diff --git a/CLOBBER b/CLOBBER index 2cb15c63b78c..10912d78ab19 100644 --- a/CLOBBER +++ b/CLOBBER @@ -22,4 +22,4 @@ # 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 diff --git a/docshell/base/moz.build b/docshell/base/moz.build index b99821324228..4da08ab4d1da 100644 --- a/docshell/base/moz.build +++ b/docshell/base/moz.build @@ -20,7 +20,6 @@ XPIDL_SOURCES += [ 'nsIDownloadHistory.idl', 'nsIGlobalHistory2.idl', 'nsILoadContext.idl', - 'nsILoadInfo.idl', 'nsIPrivacyTransitionObserver.idl', 'nsIReflowObserver.idl', 'nsIRefreshURI.idl', @@ -45,12 +44,10 @@ EXPORTS += [ EXPORTS.mozilla += [ 'IHistory.h', 'LoadContext.h', - 'LoadInfo.h', ] UNIFIED_SOURCES += [ 'LoadContext.cpp', - 'LoadInfo.cpp', 'nsAboutRedirector.cpp', 'nsDefaultURIFixup.cpp', 'nsDocShell.cpp', diff --git a/docshell/base/LoadInfo.cpp b/netwerk/base/LoadInfo.cpp similarity index 100% rename from docshell/base/LoadInfo.cpp rename to netwerk/base/LoadInfo.cpp diff --git a/docshell/base/LoadInfo.h b/netwerk/base/LoadInfo.h similarity index 100% rename from docshell/base/LoadInfo.h rename to netwerk/base/LoadInfo.h diff --git a/netwerk/base/moz.build b/netwerk/base/moz.build index 7075d5ad162a..877365bba5d2 100644 --- a/netwerk/base/moz.build +++ b/netwerk/base/moz.build @@ -53,6 +53,7 @@ XPIDL_SOURCES += [ 'nsILoadContextInfo.idl', 'nsILoadGroup.idl', 'nsILoadGroupChild.idl', + 'nsILoadInfo.idl', 'nsIMIMEInputStream.idl', 'nsIMultiPartChannel.idl', 'nsINestedURI.idl', @@ -152,6 +153,10 @@ EXPORTS += [ 'nsURLParsers.h', ] +EXPORTS.mozilla += [ + 'LoadInfo.h', +] + EXPORTS.mozilla.net += [ 'ChannelDiverterChild.h', 'ChannelDiverterParent.h', @@ -174,6 +179,7 @@ UNIFIED_SOURCES += [ 'Dashboard.cpp', 'EventTokenBucket.cpp', 'LoadContextInfo.cpp', + 'LoadInfo.cpp', 'NetworkActivityMonitor.cpp', 'nsAsyncRedirectVerifyHelper.cpp', 'nsAsyncStreamCopier.cpp', diff --git a/docshell/base/nsILoadInfo.idl b/netwerk/base/nsILoadInfo.idl similarity index 100% rename from docshell/base/nsILoadInfo.idl rename to netwerk/base/nsILoadInfo.idl