Bug 1580448 - Rename JSWindowActor into JSActor;r=nika

Differential Revision: https://phabricator.services.mozilla.com/D70038

Author: David Teller

dom/base/ChromeUtils.cpp

@@ -26,7 +26,7 @@
 #include "mozilla/dom/ContentChild.h"
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/dom/IdleDeadline.h"
-#include "mozilla/dom/JSWindowActorService.h"
+#include "mozilla/dom/JSActorService.h"
 #include "mozilla/dom/MediaControlUtils.h"
 #include "mozilla/dom/MediaControlService.h"
 #include "mozilla/dom/MediaMetadata.h"
@@ -1204,7 +1204,7 @@ void ChromeUtils::RegisterWindowActor(const GlobalObject& aGlobal,
                                       ErrorResult& aRv) {
   MOZ_ASSERT(XRE_IsParentProcess());
 
-  RefPtr<JSWindowActorService> service = JSWindowActorService::GetSingleton();
+  RefPtr<JSActorService> service = JSActorService::GetSingleton();
   service->RegisterWindowActor(aName, aOptions, aRv);
 }
 
@@ -1213,7 +1213,7 @@ void ChromeUtils::UnregisterWindowActor(const GlobalObject& aGlobal,
                                         const nsACString& aName) {
   MOZ_ASSERT(XRE_IsParentProcess());
 
-  RefPtr<JSWindowActorService> service = JSWindowActorService::GetSingleton();
+  RefPtr<JSActorService> service = JSActorService::GetSingleton();
   service->UnregisterWindowActor(aName);
 }
 

dom/base/InProcessBrowserChildMessageManager.cpp

@@ -20,7 +20,7 @@
 #include "mozilla/dom/SameProcessMessageQueue.h"
 #include "mozilla/dom/ScriptLoader.h"
 #include "mozilla/dom/WindowProxyHolder.h"
-#include "mozilla/dom/JSWindowActorService.h"
+#include "mozilla/dom/JSActorService.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
@@ -37,7 +37,7 @@ InProcessBrowserChildMessageManager::Create(nsDocShell* aShell,
   NS_ENSURE_TRUE(mm->Init(), nullptr);
 
   if (XRE_IsParentProcess()) {
-    RefPtr<JSWindowActorService> wasvc = JSWindowActorService::GetSingleton();
+    RefPtr<JSActorService> wasvc = JSActorService::GetSingleton();
     wasvc->RegisterChromeEventTarget(mm);
   }
 
@@ -111,7 +111,7 @@ InProcessBrowserChildMessageManager::InProcessBrowserChildMessageManager(
 
 InProcessBrowserChildMessageManager::~InProcessBrowserChildMessageManager() {
   if (XRE_IsParentProcess()) {
-    JSWindowActorService::UnregisterChromeEventTarget(this);
+    JSActorService::UnregisterChromeEventTarget(this);
   }
 
   mAnonymousGlobalScopes.Clear();

dom/base/nsWindowRoot.cpp

@@ -30,7 +30,7 @@
 #include "mozilla/dom/BrowserParent.h"
 #include "mozilla/dom/HTMLTextAreaElement.h"
 #include "mozilla/dom/HTMLInputElement.h"
-#include "mozilla/dom/JSWindowActorService.h"
+#include "mozilla/dom/JSActorService.h"
 
 #ifdef MOZ_XUL
 #  include "nsXULElement.h"
@@ -50,7 +50,7 @@ nsWindowRoot::~nsWindowRoot() {
   }
 
   if (XRE_IsContentProcess()) {
-    JSWindowActorService::UnregisterChromeEventTarget(this);
+    JSActorService::UnregisterChromeEventTarget(this);
   }
 }
 
@@ -379,7 +379,7 @@ already_AddRefed<EventTarget> NS_NewWindowRoot(nsPIDOMWindowOuter* aWindow) {
   nsCOMPtr<EventTarget> result = new nsWindowRoot(aWindow);
 
   if (XRE_IsContentProcess()) {
-    RefPtr<JSWindowActorService> wasvc = JSWindowActorService::GetSingleton();
+    RefPtr<JSActorService> wasvc = JSActorService::GetSingleton();
     wasvc->RegisterChromeEventTarget(result);
   }
 

dom/chrome-webidl/ChromeUtils.webidl

@@ -4,6 +4,8 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+interface nsIContentChild;
+
 /**
  * An optimized QueryInterface method, generated by generateQI.
  *

dom/chrome-webidl/JSActor.webidl

@@ -0,0 +1,54 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* 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/. */
+
+
+interface mixin JSActor {
+    [Throws]
+    void sendAsyncMessage(DOMString messageName,
+                          optional any obj);
+
+    [Throws]
+    Promise<any> sendQuery(DOMString messageName,
+                           optional any obj);
+  };
+
+/**
+ * WebIDL callback interface version of the nsIObserver interface for use when
+ * calling the observe method on JSActors.
+ *
+ * NOTE: This isn't marked as ChromeOnly, as it has no interface object, and
+ * thus cannot be conditionally exposed.
+ */
+[Exposed=Window]
+callback interface MozObserverCallback {
+  void observe(nsISupports subject, ByteString topic, DOMString? data);
+};
+
+/**
+ * WebIDL callback interface calling the `willDestroy`, `didDestroy`, and
+ * `actorCreated` methods on JSActors.
+ */
+[MOZ_CAN_RUN_SCRIPT_BOUNDARY]
+callback MozJSActorCallback = void();
+
+/**
+ * The willDestroy method, if present, will be called at the last opportunity
+ * to send messages to the remote side, giving implementers the chance to clean
+ * up and send final messages.
+ * The didDestroy method, if present, will be called after the actor is no
+ * longer able to receive any more messages.
+ * The actorCreated method, if present, will be called immediately after the
+ * actor has been created and initialized.
+ *
+ * NOTE: Messages may be received between willDestroy and didDestroy, but they
+ * may not be sent.
+ */
+[GenerateInit]
+dictionary MozJSActorCallbacks {
+  [ChromeOnly] MozJSActorCallback willDestroy;
+  [ChromeOnly] MozJSActorCallback didDestroy;
+  [ChromeOnly] MozJSActorCallback actorCreated;
+};

dom/chrome-webidl/JSWindowActor.webidl

@@ -5,18 +5,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 interface nsISupports;
-interface nsIContentChild;
-interface nsIContentParent;
-
-interface mixin JSWindowActor {
-  [Throws]
-  void sendAsyncMessage(DOMString messageName,
-                        optional any obj);
-
-  [Throws]
-  Promise<any> sendQuery(DOMString messageName,
-                         optional any obj);
-};
 
 [ChromeOnly, Exposed=Window]
 interface JSWindowActorParent {
@@ -33,13 +21,13 @@ interface JSWindowActorParent {
   [Throws]
   readonly attribute CanonicalBrowsingContext? browsingContext;
 };
-JSWindowActorParent includes JSWindowActor;
+JSWindowActorParent includes JSActor;
 
 [ChromeOnly, Exposed=Window]
 interface JSWindowActorChild {
   [ChromeOnly]
   constructor();
-  
+
   /**
    * Actor initialization occurs after the constructor is called but before the
    * first message is delivered. Until the actor is initialized, accesses to
@@ -64,45 +52,7 @@ interface JSWindowActorChild {
   [Throws]
   readonly attribute WindowProxy? contentWindow;
 };
-JSWindowActorChild includes JSWindowActor;
-
-/**
- * WebIDL callback interface version of the nsIObserver interface for use when
- * calling the observe method on JSWindowActors.
- *
- * NOTE: This isn't marked as ChromeOnly, as it has no interface object, and
- * thus cannot be conditionally exposed.
- */
-[Exposed=Window]
-callback interface MozObserverCallback {
-  void observe(nsISupports subject, ByteString topic, DOMString? data);
-};
-
-/**
- * WebIDL callback interface calling the `willDestroy`, `didDestroy`, and
- * `actorCreated` methods on JSWindowActors.
- */
-[MOZ_CAN_RUN_SCRIPT_BOUNDARY]
-callback MozJSWindowActorCallback = void();
-
-/**
- * The willDestroy method, if present, will be called at the last opportunity
- * to send messages to the remote side, giving implementers the chance to clean
- * up and send final messages.
- * The didDestroy method, if present, will be called after the actor is no
- * longer able to receive any more messages.
- * The actorCreated method, if present, will be called immediately after the
- * actor has been created and initialized.
- *
- * NOTE: Messages may be received between willDestroy and didDestroy, but they
- * may not be sent.
- */
-[GenerateInit]
-dictionary MozJSWindowActorCallbacks {
-  [ChromeOnly] MozJSWindowActorCallback willDestroy;
-  [ChromeOnly] MozJSWindowActorCallback didDestroy;
-  [ChromeOnly] MozJSWindowActorCallback actorCreated;
-};
+JSWindowActorChild includes JSActor;
 
 /**
  * Used by ChromeUtils.registerWindowActor() to register JS window actor.

dom/chrome-webidl/WindowGlobalActors.webidl

@@ -8,6 +8,7 @@ interface URI;
 interface nsIDocShell;
 interface RemoteTab;
 interface nsITransportSecurityInfo;
+interface nsIContentParent;
 
 [Exposed=Window, ChromeOnly]
 interface WindowContext {

dom/chrome-webidl/moz.build

@@ -49,6 +49,7 @@ WEBIDL_FILES = [
     'HeapSnapshot.webidl',
     'InspectorUtils.webidl',
     'IteratorResult.webidl',
+    'JSActor.webidl',
     'JSWindowActor.webidl',
     'L10nOverlays.webidl',
     'Localization.webidl',

dom/ipc/ContentChild.cpp

@@ -48,7 +48,7 @@
 #include "mozilla/dom/GetFilesHelper.h"
 #include "mozilla/dom/IPCBlobInputStreamChild.h"
 #include "mozilla/dom/IPCBlobUtils.h"
-#include "mozilla/dom/JSWindowActorService.h"
+#include "mozilla/dom/JSActorService.h"
 #include "mozilla/dom/LSObject.h"
 #include "mozilla/dom/MemoryReportRequest.h"
 #include "mozilla/dom/PLoginReputationChild.h"
@@ -2624,14 +2624,14 @@ mozilla::ipc::IPCResult ContentChild::RecvInitBlobURLs(
 
 mozilla::ipc::IPCResult ContentChild::RecvInitJSWindowActorInfos(
     nsTArray<JSWindowActorInfo>&& aInfos) {
-  RefPtr<JSWindowActorService> actSvc = JSWindowActorService::GetSingleton();
-  actSvc->LoadJSWindowActorInfos(std::move(aInfos));
+  RefPtr<JSActorService> actSvc = JSActorService::GetSingleton();
+  actSvc->LoadJSWindowActorInfos(aInfos);
   return IPC_OK();
 }
 
 mozilla::ipc::IPCResult ContentChild::RecvUnregisterJSWindowActor(
     const nsCString& aName) {
-  RefPtr<JSWindowActorService> actSvc = JSWindowActorService::GetSingleton();
+  RefPtr<JSActorService> actSvc = JSActorService::GetSingleton();
   actSvc->UnregisterWindowActor(aName);
   return IPC_OK();
 }

dom/ipc/ContentParent.cpp

@@ -92,7 +92,7 @@
 #include "mozilla/dom/GetFilesHelper.h"
 #include "mozilla/dom/IPCBlobInputStreamParent.h"
 #include "mozilla/dom/IPCBlobUtils.h"
-#include "mozilla/dom/JSWindowActorService.h"
+#include "mozilla/dom/JSActorService.h"
 #include "mozilla/dom/LocalStorageCommon.h"
 #include "mozilla/dom/MediaController.h"
 #include "mozilla/dom/MemoryReportRequest.h"
@@ -2614,7 +2614,7 @@ bool ContentParent::InitInternal(ProcessPriority aInitialPriority) {
   }
 
   // Send down WindowActorOptions at startup to content process.
-  RefPtr<JSWindowActorService> actorSvc = JSWindowActorService::GetSingleton();
+  RefPtr<JSActorService> actorSvc = JSActorService::GetSingleton();
   if (actorSvc) {
     nsTArray<JSWindowActorInfo> infos;
     actorSvc->GetJSWindowActorInfos(infos);