Bug 1268151: Clean up some dependencies in IPDL headers; r=billm

MozReview-Commit-ID: n0FkC1zcay

--HG--
extra : rebase_source : a56c34e5ab1fe9354be7b586a917b6eecff4cb31

dom/cache/CacheStreamControlChild.cpp

@@ -20,10 +20,10 @@ namespace mozilla {
 namespace dom {
 namespace cache {
 
+using mozilla::dom::OptionalFileDescriptorSet;
 using mozilla::ipc::AutoIPCStream;
 using mozilla::ipc::FileDescriptor;
 using mozilla::ipc::FileDescriptorSetChild;
-using mozilla::ipc::OptionalFileDescriptorSet;
 using mozilla::ipc::PFileDescriptorSetChild;
 
 // declared in ActorUtils.h

dom/cache/CacheStreamControlParent.cpp

@@ -20,9 +20,9 @@ namespace mozilla {
 namespace dom {
 namespace cache {
 
+using mozilla::dom::OptionalFileDescriptorSet;
 using mozilla::ipc::FileDescriptor;
 using mozilla::ipc::FileDescriptorSetParent;
-using mozilla::ipc::OptionalFileDescriptorSet;
 using mozilla::ipc::PFileDescriptorSetParent;
 
 // declared in ActorUtils.h

dom/indexedDB/PBackgroundIDBSharedTypes.ipdlh

@@ -7,6 +7,7 @@ include protocol PBackgroundMutableFile;
 include protocol PBlob;
 
 include DOMTypes;
+include ProtocolTypes;
 
 include "mozilla/dom/indexedDB/SerializationHelpers.h";
 include "mozilla/dom/quota/SerializationHelpers.h";

dom/ipc/Blob.cpp

@@ -566,7 +566,7 @@ class InputStreamParent final
   : public PBlobStreamParent
 {
   typedef mozilla::ipc::InputStreamParams InputStreamParams;
-  typedef mozilla::ipc::OptionalFileDescriptorSet OptionalFileDescriptorSet;
+  typedef mozilla::dom::OptionalFileDescriptorSet OptionalFileDescriptorSet;
 
   bool* mSyncLoopGuard;
   InputStreamParams* mParams;

dom/ipc/BlobTypes.ipdlh

@@ -0,0 +1,21 @@
+/* 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/. */
+
+include protocol PFileDescriptorSet;
+
+using struct mozilla::void_t
+  from "ipc/IPCMessageUtils.h";
+
+namespace mozilla {
+namespace dom {
+
+union OptionalFileDescriptorSet
+{
+  PFileDescriptorSet;
+  FileDescriptor[];
+  void_t;
+};
+
+}
+}

dom/ipc/DOMTypes.ipdlh

@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 include protocol PBlob;
+include ProtocolTypes;
 
 using struct mozilla::void_t
   from "ipc/IPCMessageUtils.h";
@@ -12,9 +13,6 @@ using struct mozilla::void_t
 using struct mozilla::SerializedStructuredCloneBuffer
   from "ipc/IPCMessageUtils.h";
 
-using struct nsID
-  from "nsID.h";
-
 namespace mozilla {
 namespace dom {
 

dom/ipc/PBlob.ipdl

@@ -8,6 +8,7 @@ include protocol PContent;
 include protocol PContentBridge;
 include protocol PFileDescriptorSet;
 
+include BlobTypes;
 include DOMTypes;
 include InputStreamParams;
 

dom/ipc/PBlobStream.ipdl

@@ -4,6 +4,7 @@
 
 include protocol PBlob;
 include protocol PFileDescriptorSet;
+include BlobTypes;
 include InputStreamParams;
 
 namespace mozilla {

dom/ipc/moz.build

@@ -90,6 +90,7 @@ SOURCES += [
 ]
 
 IPDL_SOURCES += [
+    'BlobTypes.ipdlh',
     'DOMTypes.ipdlh',
     'PBlob.ipdl',
     'PBlobStream.ipdl',

ipc/glue/IPCStream.ipdlh

@@ -3,6 +3,7 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 include protocol PSendStream;
+include BlobTypes;
 include InputStreamParams;
 
 namespace mozilla {

ipc/glue/InputStreamParams.ipdlh

@@ -3,9 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 include protocol PBlob;
-include protocol PFileDescriptorSet;
-
-include DOMTypes;
+include ProtocolTypes;
 
 using struct mozilla::void_t
   from "ipc/IPCMessageUtils.h";
@@ -86,12 +84,5 @@ struct MIMEInputStreamParams
   bool addContentLength;
 };
 
-union OptionalFileDescriptorSet
-{
-  PFileDescriptorSet;
-  FileDescriptor[];
-  void_t;
-};
-
 } // namespace ipc
 } // namespace mozilla

ipc/glue/PBackground.ipdl

@@ -28,6 +28,7 @@ include DOMTypes;
 include PBackgroundSharedTypes;
 include PBackgroundIDBSharedTypes;
 include PFileSystemParams;
+include ProtocolTypes;
 
 include "mozilla/dom/cache/IPCUtils.h";
 

ipc/glue/ProtocolTypes.ipdlh

@@ -4,6 +4,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/. */
 
+using struct nsID
+  from "nsID.h";
+
 namespace mozilla {
 namespace ipc {
 

netwerk/ipc/NeckoChannelParams.ipdlh

@@ -8,6 +8,7 @@
 include protocol PHttpChannel;
 include protocol PFTPChannel;
 include protocol PRtspChannel;
+include BlobTypes;
 include URIParams;
 include InputStreamParams;
 include PBackgroundSharedTypes;