Backed out 9 changesets (bug 1580448) for linux build bustages in /builds/worker/workspace/obj-build/dist/include/mozilla/dom/JSWindowActorChild.h CLOSED TREE

Backed out changeset 6b4db1a501df (bug 1580448)
Backed out changeset 677257a41457 (bug 1580448)
Backed out changeset 6db8de5fc125 (bug 1580448)
Backed out changeset fd7527c86239 (bug 1580448)
Backed out changeset bfbd3330b0a5 (bug 1580448)
Backed out changeset dafa80c63322 (bug 1580448)
Backed out changeset 2a1701831a6a (bug 1580448)
Backed out changeset 9b548bd38671 (bug 1580448)
Backed out changeset 358f764ae48b (bug 1580448)

Author: shindli

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/JSActorService.h"
+#include "mozilla/dom/JSWindowActorService.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<JSActorService> service = JSActorService::GetSingleton();
+  RefPtr<JSWindowActorService> service = JSWindowActorService::GetSingleton();
   service->RegisterWindowActor(aName, aOptions, aRv);
 }
 
@@ -1213,30 +1213,10 @@ void ChromeUtils::UnregisterWindowActor(const GlobalObject& aGlobal,
                                         const nsACString& aName) {
   MOZ_ASSERT(XRE_IsParentProcess());
 
-  RefPtr<JSActorService> service = JSActorService::GetSingleton();
+  RefPtr<JSWindowActorService> service = JSWindowActorService::GetSingleton();
   service->UnregisterWindowActor(aName);
 }
 
-/* static */
-void ChromeUtils::RegisterProcessActor(const GlobalObject& aGlobal,
-                                       const nsACString& aName,
-                                       const ProcessActorOptions& aOptions,
-                                       ErrorResult& aRv) {
-  MOZ_ASSERT(XRE_IsParentProcess());
-
-  RefPtr<JSActorService> service = JSActorService::GetSingleton();
-  service->RegisterProcessActor(aName, aOptions, aRv);
-}
-
-/* static */
-void ChromeUtils::UnregisterProcessActor(const GlobalObject& aGlobal,
-                                         const nsACString& aName) {
-  MOZ_ASSERT(XRE_IsParentProcess());
-
-  RefPtr<JSActorService> service = JSActorService::GetSingleton();
-  service->UnregisterProcessActor(aName);
-}
-
 /* static */
 bool ChromeUtils::IsClassifierBlockingErrorCode(GlobalObject& aGlobal,
                                                 uint32_t aError) {

dom/base/ChromeUtils.h

@@ -30,7 +30,6 @@ struct MediaMetadataInit;
 class MozQueryInterface;
 class PrecompiledScript;
 class Promise;
-struct ProcessActorOptions;
 struct WindowActorOptions;
 
 class ChromeUtils {
@@ -201,14 +200,6 @@ class ChromeUtils {
   static void UnregisterWindowActor(const GlobalObject& aGlobal,
                                     const nsACString& aName);
 
-  static void RegisterProcessActor(const GlobalObject& aGlobal,
-                                   const nsACString& aName,
-                                   const ProcessActorOptions& aOptions,
-                                   ErrorResult& aRv);
-
-  static void UnregisterProcessActor(const GlobalObject& aGlobal,
-                                     const nsACString& aName);
-
   static bool IsClassifierBlockingErrorCode(GlobalObject& aGlobal,
                                             uint32_t aError);
 

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

dom/chrome-webidl/ChromeUtils.webidl

@@ -4,8 +4,6 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-interface nsIContentChild;
-
 /**
  * An optimized QueryInterface method, generated by generateQI.
  *
@@ -448,18 +446,6 @@ partial namespace ChromeUtils {
   [ChromeOnly]
   void unregisterWindowActor(UTF8String aName);
 
-  /**
-   * Register a new toplevel content global actor. This method may only be
-   * called in the parent process. |name| must be globally unique.
-   *
-   * See JSProcessActor.webidl for ProcessActorOptions fields documentation.
-   */
-  [ChromeOnly, Throws]
-  void registerProcessActor(UTF8String aName, optional ProcessActorOptions aOptions = {});
-
-  [ChromeOnly]
-  void unregisterProcessActor(UTF8String aName);
-
   [ChromeOnly]
   // aError should a nsresult.
   boolean isClassifierBlockingErrorCode(unsigned long aError);

dom/chrome-webidl/JSActor.webidl

@@ -4,16 +4,19 @@
  * 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/. */
 
-/**
- * An actor architecture designed to allow compositional parent/content
- * communications. The lifetime of a JSWindowActor{Child, Parent} is the `WindowGlobalParent`
- * (for the parent-side) / `WindowGlobalChild` (for the child-side).
- *
- * See https://firefox-source-docs.mozilla.org/dom/Fission.html#jswindowactor for
- * more details on how to use this architecture.
- */
-
 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 {
@@ -30,13 +33,13 @@ interface JSWindowActorParent {
   [Throws]
   readonly attribute CanonicalBrowsingContext? browsingContext;
 };
-JSWindowActorParent includes JSActor;
+JSWindowActorParent includes JSWindowActor;
 
 [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
@@ -61,7 +64,45 @@ interface JSWindowActorChild {
   [Throws]
   readonly attribute WindowProxy? contentWindow;
 };
-JSWindowActorChild includes JSActor;
+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;
+};
 
 /**
  * Used by ChromeUtils.registerWindowActor() to register JS window actor.

dom/chrome-webidl/JSProcessActor.webidl

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

dom/chrome-webidl/JSWindowActor.webidl

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