Bug 1545758 - Move dom/file IPC components into mozilla::dom namespac…

…e - PendingIPCBlob actors, r=qdot Differential Revision: https://phabricator.services.mozilla.com/D28189 --HG-- extra : moz-landing-system : lando
trman · Apr 26, 2019 · 69fd7c5 · 69fd7c5
1 parent de92529
commit 69fd7c5
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 29 deletions.
diff --git a/dom/file/ipc/PPendingIPCBlob.ipdl b/dom/file/ipc/PPendingIPCBlob.ipdl
@@ -7,7 +7,7 @@ include protocol PBackground;
 include IPCBlob;
 
 namespace mozilla {
-namespace ipc {
+namespace dom {
 
 // IndexedDB and FileHandle do not know all the Blob/File properties when they
 // create a IPCBlob. For this reason, they need to use this simple protocol.

diff --git a/dom/file/ipc/PendingIPCBlobChild.h b/dom/file/ipc/PendingIPCBlobChild.h
@@ -4,18 +4,18 @@
  * 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/. */
 
-#ifndef mozilla_dom_ipc_PendingIPCBlobChild_h
-#define mozilla_dom_ipc_PendingIPCBlobChild_h
+#ifndef mozilla_dom_PendingIPCBlobChild_h
+#define mozilla_dom_PendingIPCBlobChild_h
 
-#include "mozilla/ipc/PPendingIPCBlob.h"
-#include "mozilla/ipc/PPendingIPCBlobChild.h"
+#include "mozilla/dom/PPendingIPCBlob.h"
+#include "mozilla/dom/PPendingIPCBlobChild.h"
 
 namespace mozilla {
 namespace dom {
 
 class BlobImpl;
 
-class PendingIPCBlobChild final : public mozilla::ipc::PPendingIPCBlobChild {
+class PendingIPCBlobChild final : public PPendingIPCBlobChild {
  public:
   explicit PendingIPCBlobChild(const IPCBlob& aBlob);
 
@@ -39,4 +39,4 @@ class PendingIPCBlobChild final : public mozilla::ipc::PPendingIPCBlobChild {
 }  // namespace dom
 }  // namespace mozilla
 
-#endif  // mozilla_dom_ipc_PendingIPCBlobChild_h
+#endif  // mozilla_dom_PendingIPCBlobChild_h
diff --git a/dom/file/ipc/PendingIPCBlobParent.h b/dom/file/ipc/PendingIPCBlobParent.h
@@ -4,10 +4,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/. */
 
-#ifndef mozilla_dom_ipc_PendingIPCBlobParent_h
-#define mozilla_dom_ipc_PendingIPCBlobParent_h
+#ifndef mozilla_dom_PendingIPCBlobParent_h
+#define mozilla_dom_PendingIPCBlobParent_h
 
-#include "mozilla/ipc/PPendingIPCBlobParent.h"
+#include "mozilla/dom/PPendingIPCBlobParent.h"
 
 namespace mozilla {
 
@@ -19,7 +19,7 @@ namespace dom {
 
 class BlobImpl;
 
-class PendingIPCBlobParent final : public mozilla::ipc::PPendingIPCBlobParent {
+class PendingIPCBlobParent final : public PPendingIPCBlobParent {
  public:
   static PendingIPCBlobParent* Create(PBackgroundParent* aManager,
                                       BlobImpl* aBlobImpl);
@@ -38,4 +38,4 @@ class PendingIPCBlobParent final : public mozilla::ipc::PPendingIPCBlobParent {
 }  // namespace dom
 }  // namespace mozilla
 
-#endif  // mozilla_dom_ipc_PendingIPCBlobParent_h
+#endif  // mozilla_dom_PendingIPCBlobParent_h
diff --git a/dom/file/ipc/moz.build b/dom/file/ipc/moz.build
@@ -17,15 +17,15 @@ EXPORTS.mozilla.dom += [
     'FileCreatorChild.h',
     'FileCreatorParent.h',
     'IPCBlobUtils.h',
+    'PendingIPCBlobChild.h',
+    'PendingIPCBlobParent.h',
 ]
 
 EXPORTS.mozilla.dom.ipc += [
     'IPCBlobInputStream.h',
     'IPCBlobInputStreamChild.h',
     'IPCBlobInputStreamParent.h',
     'IPCBlobInputStreamStorage.h',
-    'PendingIPCBlobChild.h',
-    'PendingIPCBlobParent.h',
     'TemporaryIPCBlobChild.h',
     'TemporaryIPCBlobParent.h',
 ]

diff --git a/dom/filehandle/ActorsParent.cpp b/dom/filehandle/ActorsParent.cpp
@@ -16,7 +16,7 @@
 #include "mozilla/dom/indexedDB/ActorsParent.h"
 #include "mozilla/dom/indexedDB/PBackgroundIDBDatabaseParent.h"
 #include "mozilla/dom/IPCBlobUtils.h"
-#include "mozilla/dom/ipc/PendingIPCBlobParent.h"
+#include "mozilla/dom/PendingIPCBlobParent.h"
 #include "mozilla/dom/quota/MemoryOutputStream.h"
 #include "nsAutoPtr.h"
 #include "nsComponentManagerUtils.h"

diff --git a/dom/indexedDB/ActorsChild.cpp b/dom/indexedDB/ActorsChild.cpp
@@ -28,8 +28,8 @@
 #include "mozilla/dom/PermissionMessageUtils.h"
 #include "mozilla/dom/BrowserChild.h"
 #include "mozilla/dom/indexedDB/PBackgroundIDBDatabaseFileChild.h"
-#include "mozilla/dom/ipc/PendingIPCBlobChild.h"
 #include "mozilla/dom/IPCBlobUtils.h"
+#include "mozilla/dom/PendingIPCBlobChild.h"
 #include "mozilla/dom/WorkerPrivate.h"
 #include "mozilla/dom/WorkerRunnable.h"
 #include "mozilla/Encoding.h"

diff --git a/ipc/glue/BackgroundChildImpl.cpp b/ipc/glue/BackgroundChildImpl.cpp
@@ -25,11 +25,11 @@
 #include "mozilla/dom/PFileSystemRequestChild.h"
 #include "mozilla/dom/EndpointForReportChild.h"
 #include "mozilla/dom/FileSystemTaskBase.h"
+#include "mozilla/dom/PendingIPCBlobChild.h"
 #include "mozilla/dom/cache/ActorUtils.h"
 #include "mozilla/dom/indexedDB/PBackgroundIDBFactoryChild.h"
 #include "mozilla/dom/indexedDB/PBackgroundIndexedDBUtilsChild.h"
 #include "mozilla/dom/ipc/IPCBlobInputStreamChild.h"
-#include "mozilla/dom/ipc/PendingIPCBlobChild.h"
 #include "mozilla/dom/ipc/TemporaryIPCBlobChild.h"
 #include "mozilla/dom/IPCBlobUtils.h"
 #include "mozilla/dom/quota/PQuotaChild.h"
@@ -310,13 +310,13 @@ bool BackgroundChildImpl::DeallocPBackgroundStorageChild(
   return true;
 }
 
-PPendingIPCBlobChild* BackgroundChildImpl::AllocPPendingIPCBlobChild(
+dom::PPendingIPCBlobChild* BackgroundChildImpl::AllocPPendingIPCBlobChild(
     const IPCBlob& aBlob) {
-  return new mozilla::dom::PendingIPCBlobChild(aBlob);
+  return new dom::PendingIPCBlobChild(aBlob);
 }
 
 bool BackgroundChildImpl::DeallocPPendingIPCBlobChild(
-    PPendingIPCBlobChild* aActor) {
+    dom::PPendingIPCBlobChild* aActor) {
   delete aActor;
   return true;
 }

diff --git a/ipc/glue/BackgroundParentImpl.cpp b/ipc/glue/BackgroundParentImpl.cpp
@@ -25,14 +25,14 @@
 #include "mozilla/dom/PGamepadEventChannelParent.h"
 #include "mozilla/dom/PGamepadTestChannelParent.h"
 #include "mozilla/dom/MessagePortParent.h"
+#include "mozilla/dom/PendingIPCBlobParent.h"
 #include "mozilla/dom/ServiceWorkerActors.h"
 #include "mozilla/dom/ServiceWorkerManagerParent.h"
 #include "mozilla/dom/ServiceWorkerRegistrar.h"
 #include "mozilla/dom/StorageActivityService.h"
 #include "mozilla/dom/cache/ActorUtils.h"
 #include "mozilla/dom/indexedDB/ActorsParent.h"
 #include "mozilla/dom/ipc/IPCBlobInputStreamParent.h"
-#include "mozilla/dom/ipc/PendingIPCBlobParent.h"
 #include "mozilla/dom/ipc/TemporaryIPCBlobParent.h"
 #include "mozilla/dom/IPCBlobUtils.h"
 #include "mozilla/dom/localstorage/ActorsParent.h"
@@ -468,13 +468,13 @@ bool BackgroundParentImpl::DeallocPBackgroundStorageParent(
   return mozilla::dom::DeallocPBackgroundStorageParent(aActor);
 }
 
-PPendingIPCBlobParent* BackgroundParentImpl::AllocPPendingIPCBlobParent(
-    const IPCBlob& aBlob) {
+mozilla::dom::PPendingIPCBlobParent*
+BackgroundParentImpl::AllocPPendingIPCBlobParent(const IPCBlob& aBlob) {
   MOZ_CRASH("PPendingIPCBlobParent actors should be manually constructed!");
 }
 
 bool BackgroundParentImpl::DeallocPPendingIPCBlobParent(
-    PPendingIPCBlobParent* aActor) {
+    mozilla::dom::PPendingIPCBlobParent* aActor) {
   AssertIsInMainOrSocketProcess();
   AssertIsOnBackgroundThread();
   MOZ_ASSERT(aActor);

diff --git a/ipc/ipdl/ipdl/direct_call.py b/ipc/ipdl/ipdl/direct_call.py
@@ -53,11 +53,6 @@
 
     ("PMedia", "child"): ("Child", "mozilla/media/MediaChild.h"),
 
-    ("PPendingIPCBlob", "child"): ("PendingIPCBlobChild", "mozilla/dom/ipc/PendingIPCBlobChild.h"),
-    ("PPendingIPCBlob", "parent"): (
-        "mozilla::dom::PendingIPCBlobParent", "mozilla/dom/ipc/PendingIPCBlobParent.h"
-    ),
-
     ("PPresentationRequest", "child"): (
         "PresentationRequestChild", "mozilla/dom/PresentationChild.h"
     ),