Backed out changeset f073181a927d (bug 1189195) for browser_privatebrowsing_geoprompt.js leaks CLOSED TREE

--HG--
extra : commitid : LFqvYmXqV6c

dom/base/nsContentPermissionHelper.cpp

@@ -127,7 +127,6 @@ class ContentPermissionRequestParent : public PContentPermissionRequestParent
  private:
   virtual bool Recvprompt();
   virtual bool RecvNotifyVisibility(const bool& aIsVisible);
-  virtual bool RecvDestroy();
   virtual void ActorDestroy(ActorDestroyReason why);
 };
 
@@ -168,13 +167,6 @@ ContentPermissionRequestParent::RecvNotifyVisibility(const bool& aIsVisible)
   return true;
 }
 
-bool
-ContentPermissionRequestParent::RecvDestroy()
-{
-  Unused << PContentPermissionRequestParent::Send__delete__(this);
-  return true;
-}
-
 void
 ContentPermissionRequestParent::ActorDestroy(ActorDestroyReason why)
 {
@@ -617,7 +609,7 @@ nsContentPermissionRequestProxy::Cancel()
 
   nsTArray<PermissionChoice> emptyChoices;
 
-  Unused << mParent->SendNotifyResult(false, emptyChoices);
+  Unused << ContentPermissionRequestParent::Send__delete__(mParent, false, emptyChoices);
   mParent = nullptr;
   return NS_OK;
 }
@@ -686,7 +678,7 @@ nsContentPermissionRequestProxy::Allow(JS::HandleValue aChoices)
     return NS_ERROR_FAILURE;
   }
 
-  Unused << mParent->SendNotifyResult(true, choices);
+  Unused << ContentPermissionRequestParent::Send__delete__(mParent, true, choices);
   mParent = nullptr;
   return NS_OK;
 }
@@ -740,10 +732,9 @@ RemotePermissionRequest::DoAllow(JS::HandleValue aChoices)
 
 // PContentPermissionRequestChild
 bool
-RemotePermissionRequest::RecvNotifyResult(const bool& aAllow,
-                                          InfallibleTArray<PermissionChoice>&& aChoices)
+RemotePermissionRequest::Recv__delete__(const bool& aAllow,
+                                        InfallibleTArray<PermissionChoice>&& aChoices)
 {
-  Unused << this->SendDestroy();
   mListener->RemoveListener();
   mListener = nullptr;
 

dom/base/nsContentPermissionHelper.h

@@ -188,8 +188,8 @@ public:
                           nsPIDOMWindow* aWindow);
 
   // It will be called when prompt dismissed.
-  virtual bool RecvNotifyResult(const bool &aAllow,
-                                InfallibleTArray<PermissionChoice>&& aChoices) override;
+  virtual bool Recv__delete__(const bool &aAllow,
+                              InfallibleTArray<PermissionChoice>&& aChoices) override;
 
   virtual bool RecvGetVisibility() override;
 

dom/ipc/ContentParent.cpp

@@ -2246,7 +2246,9 @@ ContentParent::NotifyTabDestroyed(const TabId& aTabId,
     // Need to close undeleted ContentPermissionRequestParents before tab is closed.
     for (auto& permissionRequestParent : parentArray) {
         nsTArray<PermissionChoice> emptyChoices;
-        Unused << PContentPermissionRequestParent::Send__delete__(permissionRequestParent);
+        Unused << PContentPermissionRequestParent::Send__delete__(permissionRequestParent,
+                                                                  false,
+                                                                  emptyChoices);
     }
 
     // There can be more than one PBrowser for a given app process

dom/ipc/PContentPermissionRequest.ipdl

@@ -15,12 +15,10 @@ protocol PContentPermissionRequest
 parent:
   prompt();
   NotifyVisibility(bool visibility);
-  Destroy();
 
 child:
   GetVisibility();
-  NotifyResult(bool allow, PermissionChoice[] choices);
-  __delete__();
+  __delete__(bool allow, PermissionChoice[] choices);
 };