Bug 1754004 - Part 2: Remove the PFileDescriptorSet interface, r=asut…

…h,necko-reviewers,kershaw This interface should no longer be required due to the changes in part 1 limiting the complexity of IPCStream instances and limiting the number of file descriptors which a single stream can attach to a message. Removing this interface is necessary to serialize nsIInputStream instances over arbitrary toplevel protocols and non-protocol IPC in the future. Differential Revision: https://phabricator.services.mozilla.com/D141039
dothq · May 5, 2022 · 0308ac1 · 0308ac1
1 parent 3ef777a
commit 0308ac1
Show file tree

Hide file tree

Showing 66 changed files with 20 additions and 612 deletions.
diff --git a/accessible/ipc/other/PDocAccessible.ipdl b/accessible/ipc/other/PDocAccessible.ipdl
@@ -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 protocol PFileDescriptorSet;
 include protocol PBrowser;
 include protocol PDocAccessiblePlatformExt;
 

diff --git a/accessible/ipc/win/PDocAccessible.ipdl b/accessible/ipc/win/PDocAccessible.ipdl
@@ -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 protocol PFileDescriptorSet;
 include protocol PBrowser;
 
 include DocAccessibleTypes;

diff --git a/dom/broadcastchannel/PBroadcastChannel.ipdl b/dom/broadcastchannel/PBroadcastChannel.ipdl
@@ -3,7 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 include protocol PBackground;
-include protocol PFileDescriptorSet; // FIXME: bug 792908
 include protocol PRemoteLazyInputStream; // FIXME: bug 792908
 
 include DOMTypes;

diff --git a/dom/cache/CacheOpParent.cpp b/dom/cache/CacheOpParent.cpp
@@ -12,13 +12,11 @@
 #include "mozilla/dom/cache/ManagerId.h"
 #include "mozilla/dom/cache/ReadStream.h"
 #include "mozilla/dom/cache/SavedTypes.h"
-#include "mozilla/ipc/FileDescriptorSetParent.h"
 #include "mozilla/ipc/InputStreamUtils.h"
 #include "mozilla/ipc/IPCStreamUtils.h"
 
 namespace mozilla::dom::cache {
 
-using mozilla::ipc::FileDescriptorSetParent;
 using mozilla::ipc::PBackgroundParent;
 
 CacheOpParent::CacheOpParent(PBackgroundParent* aIpcManager, CacheId aCacheId,

diff --git a/dom/cache/CacheStreamControlChild.cpp b/dom/cache/CacheStreamControlChild.cpp
@@ -11,19 +11,14 @@
 #include "mozilla/dom/cache/CacheTypes.h"
 #include "mozilla/dom/cache/CacheWorkerRef.h"
 #include "mozilla/dom/cache/ReadStream.h"
-#include "mozilla/ipc/FileDescriptorSetChild.h"
 #include "mozilla/ipc/IPCStreamUtils.h"
 #include "mozilla/ipc/PBackgroundChild.h"
-#include "mozilla/ipc/PFileDescriptorSetChild.h"
 #include "nsISupportsImpl.h"
 
 namespace mozilla::dom::cache {
 
-using mozilla::dom::OptionalFileDescriptorSet;
 using mozilla::ipc::AutoIPCStream;
 using mozilla::ipc::FileDescriptor;
-using mozilla::ipc::FileDescriptorSetChild;
-using mozilla::ipc::PFileDescriptorSetChild;
 
 // declared in ActorUtils.h
 already_AddRefed<PCacheStreamControlChild> AllocPCacheStreamControlChild() {

diff --git a/dom/cache/CacheStreamControlParent.cpp b/dom/cache/CacheStreamControlParent.cpp
@@ -11,20 +11,15 @@
 #include "mozilla/dom/cache/CacheTypes.h"
 #include "mozilla/dom/cache/ReadStream.h"
 #include "mozilla/dom/cache/StreamList.h"
-#include "mozilla/ipc/FileDescriptorSetParent.h"
 #include "mozilla/ipc/IPCStreamUtils.h"
 #include "mozilla/ipc/PBackgroundParent.h"
-#include "mozilla/ipc/PFileDescriptorSetParent.h"
 #include "nsISupportsImpl.h"
 #include "nsTArray.h"
 
 namespace mozilla::dom::cache {
 
-using mozilla::dom::OptionalFileDescriptorSet;
 using mozilla::ipc::AutoIPCStream;
 using mozilla::ipc::FileDescriptor;
-using mozilla::ipc::FileDescriptorSetParent;
-using mozilla::ipc::PFileDescriptorSetParent;
 
 // declared in ActorUtils.h
 void DeallocPCacheStreamControlParent(PCacheStreamControlParent* aActor) {

diff --git a/dom/cache/PCache.ipdl b/dom/cache/PCache.ipdl
@@ -5,7 +5,6 @@
 include protocol PBackground;
 include protocol PCacheOp;
 include protocol PCacheStreamControl;
-include protocol PFileDescriptorSet;
 
 include CacheTypes;
 

diff --git a/dom/cache/PCacheOp.ipdl b/dom/cache/PCacheOp.ipdl
@@ -5,7 +5,6 @@
 include protocol PCache;
 include protocol PCacheStorage;
 include protocol PCacheStreamControl;
-include protocol PFileDescriptorSet;
 
 include CacheTypes;
 

diff --git a/dom/cache/PCacheStorage.ipdl b/dom/cache/PCacheStorage.ipdl
@@ -6,7 +6,6 @@ include protocol PBackground;
 include protocol PCache;
 include protocol PCacheOp;
 include protocol PCacheStreamControl;
-include protocol PFileDescriptorSet;
 
 include CacheTypes;
 

diff --git a/dom/cache/PCacheStreamControl.ipdl b/dom/cache/PCacheStreamControl.ipdl
@@ -3,7 +3,6 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 include protocol PBackground;
-include protocol PFileDescriptorSet;
 include IPCStream;
 
 using struct nsID from "nsID.h";

diff --git a/dom/cache/TypeUtils.cpp b/dom/cache/TypeUtils.cpp
@@ -20,7 +20,6 @@
 #include "mozilla/ipc/BackgroundChild.h"
 #include "mozilla/ipc/IPCStreamUtils.h"
 #include "mozilla/ipc/PBackgroundChild.h"
-#include "mozilla/ipc/PFileDescriptorSetChild.h"
 #include "mozilla/ipc/InputStreamUtils.h"
 #include "nsCharSeparatedTokenizer.h"
 #include "nsCOMPtr.h"
@@ -38,7 +37,6 @@ using mozilla::ipc::AutoIPCStream;
 using mozilla::ipc::BackgroundChild;
 using mozilla::ipc::FileDescriptor;
 using mozilla::ipc::PBackgroundChild;
-using mozilla::ipc::PFileDescriptorSetChild;
 
 namespace {
 

diff --git a/dom/clients/manager/PClientHandle.ipdl b/dom/clients/manager/PClientHandle.ipdl
@@ -4,7 +4,6 @@
 
 include protocol PClientManager;
 include protocol PClientHandleOp;
-include protocol PFileDescriptorSet;
 include protocol PRemoteLazyInputStream;
 include ClientIPCTypes;
 

diff --git a/dom/clients/manager/PClientManager.ipdl b/dom/clients/manager/PClientManager.ipdl
@@ -7,7 +7,6 @@ include protocol PClientHandle;
 include protocol PClientManagerOp;
 include protocol PClientNavigateOp;
 include protocol PClientSource;
-include protocol PFileDescriptorSet;
 include protocol PRemoteLazyInputStream;
 include ClientIPCTypes;
 

diff --git a/dom/clients/manager/PClientSource.ipdl b/dom/clients/manager/PClientSource.ipdl
@@ -4,7 +4,6 @@
 
 include protocol PClientManager;
 include protocol PClientSourceOp;
-include protocol PFileDescriptorSet;
 include protocol PRemoteLazyInputStream;
 include ClientIPCTypes;
 

diff --git a/dom/file/ipc/BlobTypes.ipdlh b/dom/file/ipc/BlobTypes.ipdlh
diff --git a/dom/file/ipc/PFileCreator.ipdl b/dom/file/ipc/PFileCreator.ipdl
@@ -3,7 +3,6 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 include protocol PBackground;
-include protocol PFileDescriptorSet;
 include protocol PRemoteLazyInputStream;
 
 include IPCBlob;

diff --git a/dom/file/ipc/PRemoteLazyInputStream.ipdl b/dom/file/ipc/PRemoteLazyInputStream.ipdl
@@ -4,7 +4,6 @@
 
 include protocol PBackground;
 include protocol PContent;
-include protocol PFileDescriptorSet;
 include protocol PSocketProcess;
 
 include IPCStream;

diff --git a/dom/file/ipc/PTemporaryIPCBlob.ipdl b/dom/file/ipc/PTemporaryIPCBlob.ipdl
@@ -3,7 +3,6 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 include protocol PBackground;
-include protocol PFileDescriptorSet;
 include protocol PRemoteLazyInputStream;
 
 include IPCBlob;

diff --git a/dom/file/ipc/moz.build b/dom/file/ipc/moz.build
@@ -45,7 +45,6 @@ UNIFIED_SOURCES += [
 ]
 
 IPDL_SOURCES += [
-    "BlobTypes.ipdlh",
     "IPCBlob.ipdlh",
     "PFileCreator.ipdl",
     "PRemoteLazyInputStream.ipdl",

diff --git a/dom/filehandle/PBackgroundFileHandle.ipdl b/dom/filehandle/PBackgroundFileHandle.ipdl
@@ -4,7 +4,6 @@
 
 include protocol PBackgroundFileRequest;
 include protocol PBackgroundMutableFile;
-include protocol PFileDescriptorSet; // FIXME: bug 792908
 include protocol PRemoteLazyInputStream; // FIXME: bug 792908
 
 include IPCBlob;

diff --git a/dom/filesystem/PFileSystemRequest.ipdl b/dom/filesystem/PFileSystemRequest.ipdl
@@ -5,7 +5,6 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 include protocol PBackground;
-include protocol PFileDescriptorSet;
 include protocol PRemoteLazyInputStream;
 
 include IPCBlob;

diff --git a/dom/indexedDB/PBackgroundIDBCursor.ipdl b/dom/indexedDB/PBackgroundIDBCursor.ipdl
@@ -5,7 +5,6 @@
 include protocol PBackgroundIDBTransaction;
 include protocol PBackgroundIDBVersionChangeTransaction;
 include protocol PBackgroundMutableFile;
-include protocol PFileDescriptorSet; // FIXME: bug 792908
 include protocol PRemoteLazyInputStream; // FIXME: bug 792908
 
 include PBackgroundIDBSharedTypes;

diff --git a/dom/indexedDB/PBackgroundIDBDatabase.ipdl b/dom/indexedDB/PBackgroundIDBDatabase.ipdl
@@ -8,7 +8,6 @@ include protocol PBackgroundIDBFactory;
 include protocol PBackgroundIDBTransaction;
 include protocol PBackgroundIDBVersionChangeTransaction;
 include protocol PBackgroundMutableFile;
-include protocol PFileDescriptorSet; // FIXME: bug 792908
 include protocol PRemoteLazyInputStream; // FIXME: bug 792908
 
 include IPCBlob;

diff --git a/dom/indexedDB/PBackgroundIDBRequest.ipdl b/dom/indexedDB/PBackgroundIDBRequest.ipdl
@@ -5,7 +5,6 @@
 include protocol PBackgroundIDBTransaction;
 include protocol PBackgroundIDBVersionChangeTransaction;
 include protocol PBackgroundMutableFile;
-include protocol PFileDescriptorSet; // FIXME: bug 792908
 include protocol PRemoteLazyInputStream; // FIXME: bug 792908
 
 include PBackgroundIDBSharedTypes;

diff --git a/dom/indexedDB/PBackgroundIDBSharedTypes.ipdlh b/dom/indexedDB/PBackgroundIDBSharedTypes.ipdlh
@@ -4,7 +4,6 @@
 
 include protocol PBackgroundIDBDatabaseFile;
 include protocol PBackgroundMutableFile;
-include protocol PFileDescriptorSet; // FIXME: bug 792908
 include protocol PRemoteLazyInputStream; // FIXME: bug 792908
 
 include DOMTypes;

diff --git a/dom/indexedDB/PBackgroundIDBVersionChangeTransaction.ipdl b/dom/indexedDB/PBackgroundIDBVersionChangeTransaction.ipdl
@@ -7,7 +7,6 @@ include protocol PBackgroundIDBDatabase;
 include protocol PBackgroundIDBDatabaseFile;
 include protocol PBackgroundIDBRequest;
 include protocol PBackgroundMutableFile;
-include protocol PFileDescriptorSet;    // FIXME: bug 792908
 include protocol PRemoteLazyInputStream;   // FIXME: bug 792908
 
 include PBackgroundIDBSharedTypes;

diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp
@@ -98,7 +98,6 @@
 #include "mozilla/intl/LocaleService.h"
 #include "mozilla/ipc/BackgroundChild.h"
 #include "mozilla/ipc/Endpoint.h"
-#include "mozilla/ipc/FileDescriptorSetChild.h"
 #include "mozilla/ipc/FileDescriptorUtils.h"
 #include "mozilla/ipc/GeckoChildProcessHost.h"
 #include "mozilla/ipc/ProcessChild.h"
@@ -1879,28 +1878,6 @@ void ContentChild::GetAvailableDictionaries(
   aDictionaries = mAvailableDictionaries.Clone();
 }
 
-PFileDescriptorSetChild* ContentChild::SendPFileDescriptorSetConstructor(
-    const FileDescriptor& aFD) {
-  MOZ_ASSERT(NS_IsMainThread());
-
-  if (IsShuttingDown()) {
-    return nullptr;
-  }
-
-  return PContentChild::SendPFileDescriptorSetConstructor(aFD);
-}
-
-PFileDescriptorSetChild* ContentChild::AllocPFileDescriptorSetChild(
-    const FileDescriptor& aFD) {
-  return new FileDescriptorSetChild(aFD);
-}
-
-bool ContentChild::DeallocPFileDescriptorSetChild(
-    PFileDescriptorSetChild* aActor) {
-  delete static_cast<FileDescriptorSetChild*>(aActor);
-  return true;
-}
-
 already_AddRefed<PRemoteLazyInputStreamChild>
 ContentChild::AllocPRemoteLazyInputStreamChild(const nsID& aID,
                                                const uint64_t& aSize) {

diff --git a/dom/ipc/ContentChild.h b/dom/ipc/ContentChild.h
@@ -45,10 +45,6 @@ class RemoteSpellcheckEngineChild;
 class ChildProfilerController;
 class BenchmarkStorageChild;
 
-namespace ipc {
-class PFileDescriptorSetChild;
-}  // namespace ipc
-
 namespace loader {
 class PScriptCacheChild;
 }
@@ -76,7 +72,6 @@ class ContentChild final : public PContentChild,
                            public ProcessActor {
   using ClonedMessageData = mozilla::dom::ClonedMessageData;
   using FileDescriptor = mozilla::ipc::FileDescriptor;
-  using PFileDescriptorSetChild = mozilla::ipc::PFileDescriptorSetChild;
 
   friend class PContentChild;
 
@@ -466,10 +461,6 @@ class ContentChild final : public PContentChild,
 
   bool IsForBrowser() const { return mIsForBrowser; }
 
-  PFileDescriptorSetChild* AllocPFileDescriptorSetChild(const FileDescriptor&);
-
-  bool DeallocPFileDescriptorSetChild(PFileDescriptorSetChild*);
-
   MOZ_CAN_RUN_SCRIPT_BOUNDARY mozilla::ipc::IPCResult RecvConstructBrowser(
       ManagedEndpoint<PBrowserChild>&& aBrowserEp,
       ManagedEndpoint<PWindowGlobalChild>&& aWindowEp, const TabId& aTabId,
@@ -647,9 +638,6 @@ class ContentChild final : public PContentChild,
       Endpoint<PSandboxTestingChild>&& aEndpoint);
 #endif
 
-  PFileDescriptorSetChild* SendPFileDescriptorSetConstructor(
-      const FileDescriptor& aFD) override;
-
  private:
   static void ForceKillTimerCallback(nsITimer* aTimer, void* aClosure);
   void StartForceKillTimer();

diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp
@@ -147,7 +147,6 @@
 #include "mozilla/ipc/ByteBuf.h"
 #include "mozilla/ipc/CrashReporterHost.h"
 #include "mozilla/ipc/Endpoint.h"
-#include "mozilla/ipc/FileDescriptorSetParent.h"
 #include "mozilla/ipc/FileDescriptorUtils.h"
 #include "mozilla/ipc/IPCStreamUtils.h"
 #include "mozilla/ipc/TestShellParent.h"
@@ -5012,17 +5011,6 @@ ContentParent::AllocPExtensionsParent() {
   return MakeAndAddRef<extensions::ExtensionsParent>();
 }
 
-PFileDescriptorSetParent* ContentParent::AllocPFileDescriptorSetParent(
-    const FileDescriptor& aFD) {
-  return new FileDescriptorSetParent(aFD);
-}
-
-bool ContentParent::DeallocPFileDescriptorSetParent(
-    PFileDescriptorSetParent* aActor) {
-  delete static_cast<FileDescriptorSetParent*>(aActor);
-  return true;
-}
-
 void ContentParent::NotifyUpdatedDictionaries() {
   RefPtr<mozSpellChecker> spellChecker(mozSpellChecker::Create());
   MOZ_ASSERT(spellChecker, "No spell checker?");
@@ -7244,12 +7232,6 @@ mozilla::ipc::IPCResult ContentParent::RecvCommitBrowsingContextTransaction(
   return aTransaction.CommitFromIPC(aContext, this);
 }
 
-PFileDescriptorSetParent* ContentParent::SendPFileDescriptorSetConstructor(
-    const FileDescriptor& aFD) {
-  MOZ_ASSERT(NS_IsMainThread());
-  return PContentParent::SendPFileDescriptorSetConstructor(aFD);
-}
-
 mozilla::ipc::IPCResult ContentParent::RecvBlobURLDataRequest(
     const nsCString& aBlobURL, nsIPrincipal* aTriggeringPrincipal,
     nsIPrincipal* aLoadingPrincipal, const OriginAttributes& aOriginAttributes,