Bug 919296 - Minimize the #includes in netwerk/ IDL files; r=mcmanus

Brli · Sep 23, 2013 · fa89d8c · fa89d8c
1 parent b5eae7f
commit fa89d8c
Show file tree

Hide file tree

Showing 40 changed files with 66 additions and 41 deletions.
diff --git a/browser/components/feeds/src/nsFeedSniffer.cpp b/browser/components/feeds/src/nsFeedSniffer.cpp
@@ -27,6 +27,7 @@
 #include "nsIMIMEHeaderParam.h"
 
 #include "nsMimeTypes.h"
+#include "nsIURI.h"
 #include <algorithm>
 
 #define TYPE_ATOM "application/atom+xml"

diff --git a/content/base/src/nsContentAreaDragDrop.cpp b/content/base/src/nsContentAreaDragDrop.cpp
@@ -51,6 +51,7 @@
 #include "imgIContainer.h"
 #include "imgIRequest.h"
 #include "nsDOMDataTransfer.h"
+#include "nsIMIMEInfo.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/HTMLAreaElement.h"
 

diff --git a/content/html/content/src/HTMLInputElement.cpp b/content/html/content/src/HTMLInputElement.cpp
@@ -102,6 +102,7 @@
 #include "nsIStringEnumerator.h"
 #include "HTMLSplitOnSpacesTokenizer.h"
 #include "nsIController.h"
+#include "nsIMIMEInfo.h"
 
 // input type=date
 #include "js/Date.h"

diff --git a/dom/base/nsMimeTypeArray.cpp b/dom/base/nsMimeTypeArray.cpp
@@ -13,6 +13,7 @@
 #include "nsIMIMEService.h"
 #include "nsIMIMEInfo.h"
 #include "Navigator.h"
+#include "nsServiceManagerUtils.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;

diff --git a/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp b/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp
@@ -86,6 +86,7 @@
 #include "nsWebBrowserPersist.h"
 
 #include "nsIContent.h"
+#include "nsIMIMEInfo.h"
 #include "mozilla/dom/HTMLInputElement.h"
 #include "mozilla/dom/HTMLSharedElement.h"
 #include "mozilla/dom/HTMLSharedObjectElement.h"

diff --git a/netwerk/base/public/nsIApplicationCacheChannel.idl b/netwerk/base/public/nsIApplicationCacheChannel.idl
@@ -4,7 +4,6 @@
  * 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/. */
 
-#include "nsISupports.idl"
 #include "nsIApplicationCacheContainer.idl"
 
 /**

diff --git a/netwerk/base/public/nsIDashboard.idl b/netwerk/base/public/nsIDashboard.idl
@@ -3,7 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISupports.idl"
-#include "nsIDashboardEventNotifier.idl"
 
 /* A JavaScript callback function that takes a JSON as its parameter.
  * The returned JSON contains arrays with data

diff --git a/netwerk/base/public/nsIInputStreamChannel.idl b/netwerk/base/public/nsIInputStreamChannel.idl
@@ -2,9 +2,10 @@
  * 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/. */
 
-#include "nsIChannel.idl"
+#include "nsISupports.idl"
 
 interface nsIInputStream;
+interface nsIURI;
 
 /**
  * nsIInputStreamChannel

diff --git a/netwerk/base/public/nsILoadGroupChild.idl b/netwerk/base/public/nsILoadGroupChild.idl
@@ -3,7 +3,9 @@
  * 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/. */
 
-#include "nsILoadGroup.idl"
+#include "nsISupports.idl"
+
+interface nsILoadGroup;
 
 /**
  * nsILoadGroupChild provides a hierarchy of load groups so that the

diff --git a/netwerk/base/public/nsIPermissionManager.idl b/netwerk/base/public/nsIPermissionManager.idl
@@ -29,13 +29,13 @@
  */
 
 #include "nsISupports.idl"
-#include "nsISimpleEnumerator.idl"
 
 interface nsIURI;
 interface nsIObserver;
 interface nsIPrincipal;
 interface nsIDOMWindow;
 interface nsIPermission;
+interface nsISimpleEnumerator;
 
 [scriptable, uuid(c9fec678-f194-43c9-96b0-7bd9dbdd6bb0)]
 interface nsIPermissionManager : nsISupports

diff --git a/netwerk/base/public/nsIServerSocket.idl b/netwerk/base/public/nsIServerSocket.idl
@@ -4,8 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISupports.idl"
-#include "nsIFile.idl"
 
+interface nsIFile;
 interface nsIServerSocketListener;
 interface nsISocketTransport;
 

diff --git a/netwerk/base/public/nsISocketTransport.idl b/netwerk/base/public/nsISocketTransport.idl
@@ -4,12 +4,16 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsITransport.idl"
-#include "nsINetAddr.idl"
 
 interface nsIInterfaceRequestor;
+interface nsINetAddr;
 
 %{ C++
-#include "mozilla/net/DNS.h"
+namespace mozilla {
+namespace net {
+union NetAddr;
+}
+}
 %}
 native NetAddr(mozilla::net::NetAddr);
 

diff --git a/netwerk/base/public/nsISocketTransportService.idl b/netwerk/base/public/nsISocketTransportService.idl
@@ -4,8 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISupports.idl"
-#include "nsIFile.idl"
 
+interface nsIFile;
 interface nsISocketTransport;
 interface nsIProxyInfo;
 interface nsIRunnable;

diff --git a/netwerk/base/public/nsISystemProxySettings.idl b/netwerk/base/public/nsISystemProxySettings.idl
@@ -4,7 +4,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISupports.idl"
-#include "nsIURI.idl"
 
 /** 
  * This interface allows the proxy code to use platform-specific proxy

diff --git a/netwerk/base/public/nsIThreadRetargetableRequest.idl b/netwerk/base/public/nsIThreadRetargetableRequest.idl
@@ -5,7 +5,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISupports.idl"
-#include "nsIEventTarget.idl"
+
+interface nsIEventTarget;
 
 /**
  * nsIThreadRetargetableRequest

diff --git a/netwerk/base/public/nsIUDPServerSocket.idl b/netwerk/base/public/nsIUDPServerSocket.idl
@@ -4,15 +4,19 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISupports.idl"
-#include "nsINetAddr.idl"
 
+interface nsINetAddr;
 interface nsIUDPServerSocketListener;
 interface nsIUDPMessage;
 interface nsISocketTransport;
 interface nsIOutputStream;
 
 %{ C++
-#include "mozilla/net/DNS.h"
+namespace mozilla {
+namespace net {
+union NetAddr;
+}
+}
 %}
 native NetAddr(mozilla::net::NetAddr);
 [ptr] native NetAddrPtr(mozilla::net::NetAddr);

diff --git a/netwerk/base/src/Dashboard.h b/netwerk/base/src/Dashboard.h
@@ -8,6 +8,7 @@
 #include "mozilla/Mutex.h"
 #include "mozilla/net/DashboardTypes.h"
 #include "nsIDashboard.h"
+#include "nsIDashboardEventNotifier.h"
 #include "nsIDNSListener.h"
 #include "nsIServiceManager.h"
 #include "nsITimer.h"

diff --git a/netwerk/base/src/nsServerSocket.cpp b/netwerk/base/src/nsServerSocket.cpp
@@ -14,6 +14,8 @@
 #include "nsThreadUtils.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/net/DNS.h"
+#include "nsServiceManagerUtils.h"
+#include "nsIFile.h"
 
 using namespace mozilla;
 using namespace mozilla::net;

diff --git a/netwerk/base/src/nsSocketTransportService2.cpp b/netwerk/base/src/nsSocketTransportService2.cpp
@@ -22,6 +22,7 @@
 #include "mozilla/Likely.h"
 #include "mozilla/PublicSSL.h"
 #include "nsThreadUtils.h"
+#include "nsIFile.h"
 
 using namespace mozilla;
 using namespace mozilla::net;

diff --git a/netwerk/base/src/nsSocketTransportService2.h b/netwerk/base/src/nsSocketTransportService2.h
@@ -19,6 +19,7 @@
 #include "mozilla/net/DashboardTypes.h"
 
 class nsASocketHandler;
+struct PRPollDesc;
 
 //-----------------------------------------------------------------------------
 

diff --git a/netwerk/cache/nsICache.idl b/netwerk/cache/nsICache.idl
@@ -140,6 +140,3 @@ interface nsICache
     const unsigned long NO_EXPIRATION_TIME = 0xFFFFFFFF;
 };
 
-%{C++
-#include "nsError.h"
-%}
diff --git a/netwerk/cookie/nsICookieManager.idl b/netwerk/cookie/nsICookieManager.idl
@@ -4,8 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISupports.idl"
-#include "nsISimpleEnumerator.idl"
 
+interface nsISimpleEnumerator;
 
 /** 
  * An optional interface for accessing or removing the cookies

diff --git a/netwerk/dns/nsIDNSRecord.idl b/netwerk/dns/nsIDNSRecord.idl
@@ -5,7 +5,11 @@
 #include "nsISupports.idl"
 
 %{ C++
-#include "mozilla/net/DNS.h"
+namespace mozilla {
+namespace net {
+union NetAddr;
+}
+}
 %}
 native NetAddr(mozilla::net::NetAddr);
 interface nsINetAddr;

diff --git a/netwerk/dns/nsIDNSService.idl b/netwerk/dns/nsIDNSService.idl
@@ -10,8 +10,7 @@ interface nsIDNSRecord;
 interface nsIDNSListener;
 
 %{C++
-#include "nsTArray.h"
-
+template<class T> class nsTArray;
 namespace mozilla { namespace net {
     struct DNSCacheEntries;
 } }

diff --git a/netwerk/mime/nsIMIMEService.idl b/netwerk/mime/nsIMIMEService.idl
@@ -4,9 +4,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISupports.idl"
-#include "nsIMIMEInfo.idl"
-#include "nsIURI.idl"
-#include "nsIFile.idl"
+
+interface nsIFile;
+interface nsIMIMEInfo;
+interface nsIURI;
 
 %{C++
 #define NS_MIMESERVICE_CID                           \

diff --git a/netwerk/protocol/file/nsIFileChannel.idl b/netwerk/protocol/file/nsIFileChannel.idl
@@ -3,7 +3,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/. */
 
-#include "nsIChannel.idl"
+#include "nsISupports.idl"
 
 interface nsIFile;
 

diff --git a/netwerk/protocol/http/nsIHttpAuthenticableChannel.idl b/netwerk/protocol/http/nsIHttpAuthenticableChannel.idl
@@ -4,11 +4,11 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsIProxiedChannel.idl"
-#include "nsIChannel.idl"
 
 interface nsILoadGroup;
 interface nsIURI;
 interface nsIInterfaceRequestor;
+typedef unsigned long nsLoadFlags;
 
 [scriptable, uuid(701093ac-5c7f-429c-99e3-423b041fccb4)]
 interface nsIHttpAuthenticableChannel : nsIProxiedChannel

diff --git a/netwerk/protocol/http/nsIHttpChannelInternal.idl b/netwerk/protocol/http/nsIHttpChannelInternal.idl
@@ -6,9 +6,8 @@
 #include "nsISupports.idl"
 
 %{C++
-#include "nsTArray.h"
-#include "nsCOMArray.h"
-
+template<class T> class nsTArray;
+template<class T> class nsCOMArray;
 class nsCString;
 %}
 [ptr] native StringArray(nsTArray<nsCString>);

diff --git a/netwerk/socket/nsISOCKSSocketInfo.idl b/netwerk/socket/nsISOCKSSocketInfo.idl
@@ -7,7 +7,11 @@
 #include "nsISupports.idl"
 
 %{ C++
-#include "mozilla/net/DNS.h"
+namespace mozilla {
+namespace net {
+union NetAddr;
+}
+}
 %}
 [ptr] native NetAddrPtr(mozilla::net::NetAddr);
 

diff --git a/netwerk/socket/nsISSLSocketControl.idl b/netwerk/socket/nsISSLSocketControl.idl
@@ -9,7 +9,7 @@
 interface nsIInterfaceRequestor;
 
 %{C++
-#include "nsTArray.h"
+template<class T> class nsTArray;
 class nsCString;
 %}
 [ref] native nsCStringTArrayRef(nsTArray<nsCString>);

diff --git a/netwerk/streamconv/converters/nsFTPDirListingConv.cpp b/netwerk/streamconv/converters/nsFTPDirListingConv.cpp
@@ -14,6 +14,7 @@
 #include "nsCRT.h"
 #include "nsAutoPtr.h"
 #include "nsIChannel.h"
+#include "nsIURI.h"
 
 #include "ParseFTPList.h"
 #include <algorithm>

diff --git a/netwerk/streamconv/public/mozITXTToHTMLConv.idl b/netwerk/streamconv/public/mozITXTToHTMLConv.idl
@@ -12,7 +12,6 @@
  */
 
 #include "nsIStreamConverter.idl"
-#include "nsrootidl.idl"
 
 %{C++
 // {77c0e42a-1dd2-11b2-8ebf-edc6606f2f4b}

diff --git a/netwerk/streamconv/public/nsIAppleFileDecoder.idl b/netwerk/streamconv/public/nsIAppleFileDecoder.idl
@@ -4,8 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsIOutputStream.idl"
-#include "nsIFile.idl"
 
+interface nsIFile;
 
 %{C++
 #define NS_APPLEFILEDECODER_CID                      \

diff --git a/netwerk/streamconv/public/nsIStreamConverter.idl b/netwerk/streamconv/public/nsIStreamConverter.idl
@@ -4,8 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsIStreamListener.idl"
-#include "nsIInputStream.idl"
-#include "nsIURI.idl"
+
+interface nsIInputStream;
 
 /**
  * nsIStreamConverter provides an interface to implement when you have code

diff --git a/netwerk/streamconv/public/nsIStreamConverterService.idl b/netwerk/streamconv/public/nsIStreamConverterService.idl
@@ -3,8 +3,10 @@
  * 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/. */
 
-#include "nsIInputStream.idl"
-#include "nsIStreamListener.idl"
+#include "nsISupports.idl"
+
+interface nsIInputStream;
+interface nsIStreamListener;
 
 %{C++
 #define NS_ISTREAMCONVERTER_KEY         "@mozilla.org/streamconv;1"

diff --git a/netwerk/streamconv/public/nsITXTToHTMLConv.idl b/netwerk/streamconv/public/nsITXTToHTMLConv.idl
@@ -4,7 +4,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsIStreamConverter.idl"
-#include "nsrootidl.idl"
 
 [scriptable, uuid(933355f6-1dd2-11b2-a9b0-d335b9e35983)]
 interface nsITXTToHTMLConv : nsIStreamConverter {

diff --git a/netwerk/test/TestUDPServerSocket.cpp b/netwerk/test/TestUDPServerSocket.cpp
@@ -9,6 +9,7 @@
 #include "nsISocketTransport.h"
 #include "nsIOutputStream.h"
 #include "nsIInputStream.h"
+#include "nsINetAddr.h"
 
 #define UDP_PORT 1234
 #define REQUEST  0x68656c6f

diff --git a/netwerk/wifi/nsIWifiListener.idl b/netwerk/wifi/nsIWifiListener.idl
@@ -3,9 +3,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISupports.idl"
-#include "nsIArray.idl"
 
-#include "nsIWifiAccessPoint.idl"
+interface nsIWifiAccessPoint;
 
 [scriptable, uuid(BCD4BEDE-F4A5-4A62-9071-D7A60174E376)]
 interface nsIWifiListener : nsISupports
-Original file line number
+Diff line change
@@ Expand Up / @@ -140,6 +140,3 @@ interface nsICache @@
         const unsigned long NO_EXPIRATION_TIME = 0xFFFFFFFF;
     };
-    %{C++
-    #include "nsError.h"
-    %}