Bug 1527625 - Fill required arguments for ReceiveMessageArgument, r=nika

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

--HG--
extra : moz-landing-system : lando

Author: johndai1984

dom/ipc/JSWindowActorChild.cpp

@@ -108,10 +108,15 @@ void JSWindowActorChild::SendAsyncMessage(JSContext* aCx,
   }
 }
 
-NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(JSWindowActorChild, mManager)
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(JSWindowActorChild)
+  NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
+  NS_INTERFACE_MAP_ENTRY(nsISupports)
+NS_INTERFACE_MAP_END
+
+NS_IMPL_CYCLE_COLLECTING_ADDREF(JSWindowActorChild)
+NS_IMPL_CYCLE_COLLECTING_RELEASE(JSWindowActorChild)
 
-NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(JSWindowActorChild, AddRef)
-NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(JSWindowActorChild, Release)
+NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(JSWindowActorChild, mManager)
 
 }  // namespace dom
 }  // namespace mozilla

dom/ipc/JSWindowActorChild.h

@@ -25,10 +25,10 @@ class WindowGlobalChild;
 namespace mozilla {
 namespace dom {
 
-class JSWindowActorChild final : public nsWrapperCache {
+class JSWindowActorChild final : public nsISupports, public nsWrapperCache {
  public:
-  NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(JSWindowActorChild)
-  NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(JSWindowActorChild)
+  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
+  NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(JSWindowActorChild)
 
  protected:
   ~JSWindowActorChild() = default;

dom/ipc/JSWindowActorParent.cpp

@@ -107,10 +107,15 @@ void JSWindowActorParent::SendAsyncMessage(JSContext* aCx,
   }
 }
 
-NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(JSWindowActorParent, mManager)
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(JSWindowActorParent)
+  NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
+  NS_INTERFACE_MAP_ENTRY(nsISupports)
+NS_INTERFACE_MAP_END
+
+NS_IMPL_CYCLE_COLLECTING_ADDREF(JSWindowActorParent)
+NS_IMPL_CYCLE_COLLECTING_RELEASE(JSWindowActorParent)
 
-NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(JSWindowActorParent, AddRef)
-NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(JSWindowActorParent, Release)
+NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(JSWindowActorParent, mManager)
 
 }  // namespace dom
 }  // namespace mozilla

dom/ipc/JSWindowActorParent.h

@@ -25,10 +25,10 @@ class WindowGlobalParent;
 namespace mozilla {
 namespace dom {
 
-class JSWindowActorParent final : public nsWrapperCache {
+class JSWindowActorParent final : public nsISupports, public nsWrapperCache {
  public:
-  NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(JSWindowActorParent)
-  NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(JSWindowActorParent)
+  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
+  NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(JSWindowActorParent)
 
  protected:
   ~JSWindowActorParent() = default;

dom/ipc/JSWindowActorService.cpp

@@ -557,7 +557,8 @@ void JSWindowActorService::ConstructActor(const nsAString& aName,
   }
 }
 
-void JSWindowActorService::ReceiveMessage(JS::RootedObject& aObj,
+void JSWindowActorService::ReceiveMessage(nsISupports* aTarget,
+                                          JS::RootedObject& aObj,
                                           const nsString& aMessageName,
                                           ipc::StructuredCloneData& aData) {
   IgnoredErrorResult error;
@@ -579,9 +580,12 @@ void JSWindowActorService::ReceiveMessage(JS::RootedObject& aObj,
 
   RootedDictionary<ReceiveMessageArgument> argument(cx);
   argument.mObjects = JS_NewPlainObject(cx);
+  argument.mTarget = aTarget;
   argument.mName = aMessageName;
   argument.mData = json;
   argument.mJson = json;
+  argument.mSync = false;
+
   JS::RootedValue argv(cx);
   if (NS_WARN_IF(!ToJSValue(cx, argument, &argv))) {
     return;

dom/ipc/JSWindowActorService.h

@@ -43,7 +43,8 @@ class JSWindowActorService final {
                       BrowsingContext* aBrowsingContext,
                       JS::MutableHandleObject aActor, ErrorResult& aRv);
 
-  void ReceiveMessage(JS::RootedObject& aObj, const nsString& aMessageName,
+  void ReceiveMessage(nsISupports* aActor, JS::RootedObject& aObj,
+                      const nsString& aMessageName,
                       ipc::StructuredCloneData& aData);
 
   // Register or unregister a WindowRoot object from this JSWindowActorService.

dom/ipc/WindowGlobalChild.cpp

@@ -148,7 +148,7 @@ void WindowGlobalChild::HandleAsyncMessage(const nsString& aActorName,
     return;
   }
 
-  actorSvc->ReceiveMessage(obj, aMessageName, aData);
+  actorSvc->ReceiveMessage(actor, obj, aMessageName, aData);
 }
 
 already_AddRefed<JSWindowActorChild> WindowGlobalChild::GetActor(

dom/ipc/WindowGlobalParent.cpp

@@ -191,7 +191,7 @@ void WindowGlobalParent::HandleAsyncMessage(const nsString& aActorName,
     return;
   }
 
-  actorSvc->ReceiveMessage(obj, aMessageName, aData);
+  actorSvc->ReceiveMessage(actor, obj, aMessageName, aData);
 }
 
 already_AddRefed<JSWindowActorParent> WindowGlobalParent::GetActor(