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