Bug 1752444 - Part 2: Rewrite direct_call.py protocols to use {Parent…

…,Child}Impl attributes, r=ipc-reviewers,media-playback-reviewers,alwu,mccr8 This is a mechanical change which was performed by a script based on the contents of direct_call.py, and then manually checked over to fix various rewriting bugs caused by my glorified sed script. See the previous part for more context on the change. Differential Revision: https://phabricator.services.mozilla.com/D137227
iaxat · Feb 9, 2022 · fe46df6 · fe46df6
1 parent 80daaa9
commit fe46df6
Show file tree

Hide file tree

Showing 165 changed files with 445 additions and 110 deletions.
diff --git a/accessible/ipc/other/PDocAccessible.ipdl b/accessible/ipc/other/PDocAccessible.ipdl
@@ -79,7 +79,8 @@ struct TextRangeData
   int32_t EndOffset;
 };
 
-[NestedUpTo=inside_sync] sync protocol PDocAccessible
+[NestedUpTo=inside_sync, ChildImpl=virtual, ParentImpl=virtual]
+sync protocol PDocAccessible
 {
   manager PBrowser;
   manages PDocAccessiblePlatformExt;

diff --git a/accessible/ipc/win/PDocAccessible.ipdl b/accessible/ipc/win/PDocAccessible.ipdl
@@ -43,6 +43,7 @@ struct ShowEventData
   bool EventSuppressed;
 };
 
+[ChildImpl=virtual, ParentImpl=virtual]
 sync protocol PDocAccessible
 {
   manager PBrowser;

diff --git a/dom/broadcastchannel/PBroadcastChannel.ipdl b/dom/broadcastchannel/PBroadcastChannel.ipdl
@@ -16,6 +16,7 @@ namespace mozilla {
 namespace dom {
 
 // This protocol is used for the BroadcastChannel API
+[ChildImpl=virtual, ParentImpl=virtual]
 protocol PBroadcastChannel
 {
   manager PBackground;

diff --git a/dom/clients/manager/PClientHandle.ipdl b/dom/clients/manager/PClientHandle.ipdl
@@ -15,6 +15,7 @@ include "mozilla/ipc/ProtocolMessageUtils.h";
 namespace mozilla {
 namespace dom {
 
+[ChildImpl=virtual, ParentImpl=virtual]
 protocol PClientHandle
 {
   manager PClientManager;

diff --git a/dom/clients/manager/PClientHandleOp.ipdl b/dom/clients/manager/PClientHandleOp.ipdl
@@ -8,6 +8,7 @@ include ClientIPCTypes;
 namespace mozilla {
 namespace dom {
 
+[ChildImpl=virtual, ParentImpl=virtual]
 protocol PClientHandleOp
 {
   manager PClientHandle;

diff --git a/dom/clients/manager/PClientManager.ipdl b/dom/clients/manager/PClientManager.ipdl
@@ -16,6 +16,7 @@ include ClientIPCTypes;
 namespace mozilla {
 namespace dom {
 
+[ChildImpl=virtual, ParentImpl=virtual]
 sync protocol PClientManager
 {
   manager PBackground;

diff --git a/dom/clients/manager/PClientManagerOp.ipdl b/dom/clients/manager/PClientManagerOp.ipdl
@@ -8,6 +8,7 @@ include ClientIPCTypes;
 namespace mozilla {
 namespace dom {
 
+[ChildImpl=virtual, ParentImpl=virtual]
 protocol PClientManagerOp
 {
   manager PClientManager;

diff --git a/dom/clients/manager/PClientNavigateOp.ipdl b/dom/clients/manager/PClientNavigateOp.ipdl
@@ -8,6 +8,7 @@ include ClientIPCTypes;
 namespace mozilla {
 namespace dom {
 
+[ChildImpl=virtual, ParentImpl=virtual]
 protocol PClientNavigateOp
 {
   manager PClientManager;

diff --git a/dom/clients/manager/PClientSource.ipdl b/dom/clients/manager/PClientSource.ipdl
@@ -13,6 +13,7 @@ include ClientIPCTypes;
 namespace mozilla {
 namespace dom {
 
+[ChildImpl=virtual, ParentImpl=virtual]
 sync protocol PClientSource
 {
   manager PClientManager;

diff --git a/dom/clients/manager/PClientSourceOp.ipdl b/dom/clients/manager/PClientSourceOp.ipdl
@@ -8,6 +8,7 @@ include ClientIPCTypes;
 namespace mozilla {
 namespace dom {
 
+[ChildImpl=virtual, ParentImpl=virtual]
 protocol PClientSourceOp
 {
   manager PClientSource;

diff --git a/dom/filehandle/PBackgroundFileHandle.ipdl b/dom/filehandle/PBackgroundFileHandle.ipdl
@@ -11,6 +11,8 @@ include protocol PRemoteLazyInputStream; // FIXME: bug 792908
 
 include IPCBlob;
 
+include "mozilla/dom/indexedDB/ActorsChild.h";
+
 namespace mozilla {
 namespace dom {
 
@@ -67,6 +69,7 @@ union FileRequestParams
   FileRequestFlushParams;
 };
 
+[ChildImpl="indexedDB::BackgroundFileHandleChild", ParentImpl=virtual]
 protocol PBackgroundFileHandle
 {
   manager PBackgroundMutableFile;

diff --git a/dom/filehandle/PBackgroundFileRequest.ipdl b/dom/filehandle/PBackgroundFileRequest.ipdl
@@ -4,6 +4,8 @@
 
 include protocol PBackgroundFileHandle;
 
+include "mozilla/dom/indexedDB/ActorsChild.h";
+
 using struct mozilla::void_t from "mozilla/ipc/IPCCore.h";
 
 namespace mozilla {
@@ -47,6 +49,7 @@ union FileRequestResponse
   FileRequestFlushResponse;
 };
 
+[ChildImpl="indexedDB::BackgroundFileRequestChild", ParentImpl=virtual]
 protocol PBackgroundFileRequest
 {
   manager PBackgroundFileHandle;

diff --git a/dom/filehandle/PBackgroundMutableFile.ipdl b/dom/filehandle/PBackgroundMutableFile.ipdl
@@ -6,13 +6,16 @@ include protocol PBackgroundFileHandle;
 include protocol PBackgroundIDBDatabase;
 
 include "mozilla/dom/filehandle/SerializationHelpers.h";
+include "mozilla/dom/indexedDB/ActorsChild.h";
+include "mozilla/dom/filehandle/ActorsParent.h";
 
 using mozilla::dom::FileMode
   from "mozilla/dom/FileModeBinding.h";
 
 namespace mozilla {
 namespace dom {
 
+[ChildImpl="indexedDB::BackgroundMutableFileChild", ParentImpl="BackgroundMutableFileParentBase"]
 sync protocol PBackgroundMutableFile
 {
   manager PBackgroundIDBDatabase;

diff --git a/dom/filesystem/PFileSystemRequest.ipdl b/dom/filesystem/PFileSystemRequest.ipdl
@@ -12,6 +12,8 @@ include protocol PRemoteLazyInputStream;
 
 include IPCBlob;
 
+include "mozilla/dom/FileSystemTaskBase.h";
+
 namespace mozilla {
 namespace dom {
 
@@ -66,7 +68,8 @@ union FileSystemResponseValue
   FileSystemErrorResponse;
 };
 
-[RefCounted] protocol PFileSystemRequest
+[RefCounted, ChildImpl="FileSystemTaskChildBase"]
+protocol PFileSystemRequest
 {
   manager PBackground;
 

diff --git a/dom/indexedDB/PBackgroundIDBCursor.ipdl b/dom/indexedDB/PBackgroundIDBCursor.ipdl
@@ -13,6 +13,7 @@ include protocol PRemoteLazyInputStream; // FIXME: bug 792908
 include PBackgroundIDBSharedTypes;
 
 include "mozilla/dom/indexedDB/SerializationHelpers.h";
+include "mozilla/dom/indexedDB/ActorsChild.h";
 
 using struct mozilla::void_t from "mozilla/ipc/IPCCore.h";
 
@@ -83,7 +84,8 @@ union CursorResponse
   IndexKeyCursorResponse[];
 };
 
-[RefCounted] protocol PBackgroundIDBCursor
+[RefCounted, ChildImpl="indexedDB::BackgroundCursorChildBase", ParentImpl=virtual]
+protocol PBackgroundIDBCursor
 {
   manager PBackgroundIDBTransaction or PBackgroundIDBVersionChangeTransaction;
 

diff --git a/dom/indexedDB/PBackgroundIDBDatabase.ipdl b/dom/indexedDB/PBackgroundIDBDatabase.ipdl
@@ -18,6 +18,7 @@ include InputStreamParams;
 include PBackgroundIDBSharedTypes;
 
 include "mozilla/dom/indexedDB/SerializationHelpers.h";
+include "mozilla/dom/indexedDB/ActorsChild.h";
 
 using struct mozilla::null_t from "mozilla/ipc/IPCCore.h";
 
@@ -39,6 +40,7 @@ union DatabaseRequestParams
   CreateFileParams;
 };
 
+[ChildImpl="indexedDB::BackgroundDatabaseChild", ParentImpl=virtual]
 sync protocol PBackgroundIDBDatabase
 {
   manager PBackgroundIDBFactory;

diff --git a/dom/indexedDB/PBackgroundIDBDatabaseFile.ipdl b/dom/indexedDB/PBackgroundIDBDatabaseFile.ipdl
@@ -8,6 +8,7 @@ namespace mozilla {
 namespace dom {
 namespace indexedDB {
 
+[ChildImpl=virtual, ParentImpl=virtual]
 protocol PBackgroundIDBDatabaseFile
 {
   manager PBackgroundIDBDatabase;

diff --git a/dom/indexedDB/PBackgroundIDBDatabaseRequest.ipdl b/dom/indexedDB/PBackgroundIDBDatabaseRequest.ipdl
@@ -5,6 +5,8 @@
 include protocol PBackgroundIDBDatabase;
 include protocol PBackgroundMutableFile;
 
+include "mozilla/dom/indexedDB/ActorsChild.h";
+
 namespace mozilla {
 namespace dom {
 namespace indexedDB {
@@ -20,6 +22,7 @@ union DatabaseRequestResponse
   CreateFileRequestResponse;
 };
 
+[ChildImpl="indexedDB::BackgroundDatabaseRequestChild", ParentImpl=virtual]
 protocol PBackgroundIDBDatabaseRequest
 {
   manager PBackgroundIDBDatabase;

diff --git a/dom/indexedDB/PBackgroundIDBFactory.ipdl b/dom/indexedDB/PBackgroundIDBFactory.ipdl
@@ -10,6 +10,7 @@ include PBackgroundIDBSharedTypes;
 include PBackgroundSharedTypes;
 
 include "mozilla/dom/quota/SerializationHelpers.h";
+include "mozilla/dom/indexedDB/ActorsChild.h";
 
 using struct mozilla::void_t from "mozilla/ipc/IPCCore.h";
 
@@ -39,7 +40,8 @@ union FactoryRequestParams
   DeleteDatabaseRequestParams;
 };
 
-[RefCounted] sync protocol PBackgroundIDBFactory
+[RefCounted, ChildImpl="indexedDB::BackgroundFactoryChild", ParentImpl=virtual]
+sync protocol PBackgroundIDBFactory
 {
   manager PBackground;
 

diff --git a/dom/indexedDB/PBackgroundIDBFactoryRequest.ipdl b/dom/indexedDB/PBackgroundIDBFactoryRequest.ipdl
@@ -7,6 +7,8 @@ include protocol PBackgroundIDBDatabase;
 
 include PBackgroundSharedTypes;
 
+include "mozilla/dom/indexedDB/ActorsChild.h";
+
 namespace mozilla {
 namespace dom {
 namespace indexedDB {
@@ -28,6 +30,7 @@ union FactoryRequestResponse
   DeleteDatabaseRequestResponse;
 };
 
+[ChildImpl="indexedDB::BackgroundFactoryRequestChild", ParentImpl=virtual]
 protocol PBackgroundIDBFactoryRequest
 {
   manager PBackgroundIDBFactory;

diff --git a/dom/indexedDB/PBackgroundIDBRequest.ipdl b/dom/indexedDB/PBackgroundIDBRequest.ipdl
@@ -13,6 +13,7 @@ include protocol PRemoteLazyInputStream; // FIXME: bug 792908
 include PBackgroundIDBSharedTypes;
 
 include "mozilla/dom/indexedDB/SerializationHelpers.h";
+include "mozilla/dom/indexedDB/ActorsChild.h";
 
 using struct mozilla::void_t from "mozilla/ipc/IPCCore.h";
 
@@ -146,6 +147,7 @@ union PreprocessResponse
   ObjectStoreGetAllPreprocessResponse;
 };
 
+[ChildImpl="indexedDB::BackgroundRequestChild", ParentImpl=virtual]
 protocol PBackgroundIDBRequest
 {
   manager PBackgroundIDBTransaction or PBackgroundIDBVersionChangeTransaction;

diff --git a/dom/indexedDB/PBackgroundIDBTransaction.ipdl b/dom/indexedDB/PBackgroundIDBTransaction.ipdl
@@ -10,11 +10,14 @@ include protocol PBackgroundMutableFile;
 
 include PBackgroundIDBSharedTypes;
 
+include "mozilla/dom/indexedDB/ActorsChild.h";
+
 namespace mozilla {
 namespace dom {
 namespace indexedDB {
 
-[RefCounted] protocol PBackgroundIDBTransaction {
+[RefCounted, ChildImpl="indexedDB::BackgroundTransactionChild", ParentImpl=virtual]
+protocol PBackgroundIDBTransaction {
   manager PBackgroundIDBDatabase;
 
   manages PBackgroundIDBCursor;

diff --git a/dom/indexedDB/PBackgroundIDBVersionChangeTransaction.ipdl b/dom/indexedDB/PBackgroundIDBVersionChangeTransaction.ipdl
@@ -14,11 +14,14 @@ include protocol PRemoteLazyInputStream;   // FIXME: bug 792908
 
 include PBackgroundIDBSharedTypes;
 
+include "mozilla/dom/indexedDB/ActorsChild.h";
+
 namespace mozilla {
 namespace dom {
 namespace indexedDB {
 
-[RefCounted] protocol PBackgroundIDBVersionChangeTransaction {
+[RefCounted, ChildImpl="indexedDB::BackgroundVersionChangeTransactionChild", ParentImpl=virtual]
+protocol PBackgroundIDBVersionChangeTransaction {
   manager PBackgroundIDBDatabase;
 
   manages PBackgroundIDBCursor;

diff --git a/dom/indexedDB/PBackgroundIndexedDBUtils.ipdl b/dom/indexedDB/PBackgroundIndexedDBUtils.ipdl
@@ -5,6 +5,7 @@
 include protocol PBackground;
 
 include "mozilla/dom/quota/SerializationHelpers.h";
+include "mozilla/dom/indexedDB/ActorsChild.h";
 
 using mozilla::dom::quota::PersistenceType
   from "mozilla/dom/quota/PersistenceType.h";
@@ -13,6 +14,7 @@ namespace mozilla {
 namespace dom {
 namespace indexedDB {
 
+[ChildImpl="indexedDB::BackgroundUtilsChild", ParentImpl=virtual]
 sync protocol PBackgroundIndexedDBUtils
 {
   manager PBackground;

diff --git a/dom/ipc/PColorPicker.ipdl b/dom/ipc/PColorPicker.ipdl
@@ -10,6 +10,7 @@ include protocol PBrowser;
 namespace mozilla {
 namespace dom {
 
+[ChildImpl=virtual, ParentImpl=virtual]
 protocol PColorPicker
 {
     manager PBrowser;

diff --git a/dom/ipc/PContentPermissionRequest.ipdl b/dom/ipc/PContentPermissionRequest.ipdl
@@ -5,9 +5,12 @@
 include protocol PContent;
 include PContentPermission;
 
+include "nsContentPermissionHelper.h";
+
 namespace mozilla {
 namespace dom {
 
+[ChildImpl="RemotePermissionRequest", ParentImpl=virtual]
 protocol PContentPermissionRequest
 {
   manager PContent;

diff --git a/dom/ipc/PCycleCollectWithLogs.ipdl b/dom/ipc/PCycleCollectWithLogs.ipdl
@@ -8,6 +8,7 @@ include protocol PContent;
 namespace mozilla {
 namespace dom {
 
+[ChildImpl=virtual, ParentImpl=virtual]
 protocol PCycleCollectWithLogs {
     manager PContent;
 

diff --git a/dom/ipc/PFilePicker.ipdl b/dom/ipc/PFilePicker.ipdl
@@ -34,6 +34,7 @@ union MaybeInputData
   void_t;
 };
 
+[ChildImpl=virtual]
 protocol PFilePicker
 {
   manager PBrowser;

diff --git a/dom/ipc/PLoginReputation.ipdl b/dom/ipc/PLoginReputation.ipdl
@@ -7,13 +7,16 @@
 
 include protocol PContent;
 
+include "mozilla/LoginReputationIPC.h";
+
 namespace mozilla {
 namespace dom {
 
 // PLoginReputation allows child to send URL to parent when user focuses
 // on a password field. Right now this is an one way IPC call (No callback
 // will return after parent receives the IPC message) since we just process
 // the URL in parent (LoginReputationService) and stores the result to telemetry.
+[ChildImpl=virtual, ParentImpl="LoginReputationParent"]
 protocol PLoginReputation
 {
   manager PContent;

diff --git a/dom/ipc/PProcessHangMonitor.ipdl b/dom/ipc/PProcessHangMonitor.ipdl
@@ -23,6 +23,7 @@ struct SlowScriptData
   double duration;
 };
 
+[ChildImpl=virtual, ParentImpl=virtual]
 protocol PProcessHangMonitor
 {
 parent:

diff --git a/dom/ipc/PURLClassifierLocal.ipdl b/dom/ipc/PURLClassifierLocal.ipdl
@@ -10,6 +10,8 @@ include protocol PContent;
 include PURLClassifierInfo;
 
 include "mozilla/ipc/URIUtils.h";
+include "mozilla/dom/URLClassifierParent.h";
+include "mozilla/dom/URLClassifierChild.h";
 
 [RefCounted] using class nsIURI from "nsIURI.h";
 
@@ -23,6 +25,7 @@ struct URLClassifierLocalResult
   nsCString matchingList;
 };
 
+[ChildImpl="URLClassifierLocalChild", ParentImpl="URLClassifierLocalParent"]
 protocol PURLClassifierLocal
 {
   manager PContent;

diff --git a/dom/localstorage/PBackgroundLSDatabase.ipdl b/dom/localstorage/PBackgroundLSDatabase.ipdl
@@ -80,6 +80,7 @@ struct LSSnapshotInitInfo
  * ContentParent::AboutToLoadHttpFtpDocumentForChild, the central place
  * for pre-loading.)
  */
+[ChildImpl=virtual, ParentImpl=virtual]
 sync protocol PBackgroundLSDatabase
 {
   manager PBackground;
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,6 +34,7 @@ union MaybeInputData @@
       void_t;
     };
+    [ChildImpl=virtual]
     protocol PFilePicker
     {
       manager PBrowser;
@@ Expand Down @@