Bug 1529942 - part 0 - remove unused ContentParent argument from ExternalHelperAppParent::Init; r=qdot
authorNathan Froyd <froydnj@mozilla.com>
Mon, 25 Feb 2019 13:13:43 -0500
changeset 518767 a0429623a0a56e2d6e93eb03ae5ad616f558333d
parent 518766 0a69ff6e8daa8fae4645fc28e818e80003cc4898
child 518768 c67d5054674e9ade7a3043cfa44092c1376def4a
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersqdot
bugs1529942
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1529942 - part 0 - remove unused ContentParent argument from ExternalHelperAppParent::Init; r=qdot
dom/ipc/ContentParent.cpp
uriloader/exthandler/ExternalHelperAppParent.cpp
uriloader/exthandler/ExternalHelperAppParent.h
--- a/dom/ipc/ContentParent.cpp
+++ b/dom/ipc/ContentParent.cpp
@@ -3603,17 +3603,17 @@ PExternalHelperAppParent* ContentParent:
     const uint32_t& aContentDispositionHint,
     const nsString& aContentDispositionFilename, const bool& aForceSave,
     const int64_t& aContentLength, const bool& aWasFileChannel,
     const OptionalURIParams& aReferrer, PBrowserParent* aBrowser) {
   ExternalHelperAppParent* parent = new ExternalHelperAppParent(
       uri, aLoadInfoArgs, aContentLength, aWasFileChannel, aContentDisposition,
       aContentDispositionHint, aContentDispositionFilename);
   parent->AddRef();
-  parent->Init(this, aMimeContentType, aForceSave, aReferrer, aBrowser);
+  parent->Init(aMimeContentType, aForceSave, aReferrer, aBrowser);
   return parent;
 }
 
 bool ContentParent::DeallocPExternalHelperAppParent(
     PExternalHelperAppParent* aService) {
   ExternalHelperAppParent* parent =
       static_cast<ExternalHelperAppParent*>(aService);
   parent->Release();
--- a/uriloader/exthandler/ExternalHelperAppParent.cpp
+++ b/uriloader/exthandler/ExternalHelperAppParent.cpp
@@ -83,18 +83,17 @@ already_AddRefed<nsIInterfaceRequestor> 
 
 void UpdateContentContext(nsIStreamListener* aListener,
                           PBrowserParent* aBrowser) {
   MOZ_ASSERT(aListener);
   nsCOMPtr<nsIInterfaceRequestor> window = GetWindowFromTabParent(aBrowser);
   static_cast<nsExternalAppHandler*>(aListener)->SetContentContext(window);
 }
 
-void ExternalHelperAppParent::Init(ContentParent* parent,
-                                   const nsCString& aMimeContentType,
+void ExternalHelperAppParent::Init(const nsCString& aMimeContentType,
                                    const bool& aForceSave,
                                    const OptionalURIParams& aReferrer,
                                    PBrowserParent* aBrowser) {
   nsCOMPtr<nsIExternalHelperAppService> helperAppService =
       do_GetService(NS_EXTERNALHELPERAPPSERVICE_CONTRACTID);
   NS_ASSERTION(helperAppService, "No Helper App Service!");
 
   nsCOMPtr<nsIURI> referrer = DeserializeURI(aReferrer);
--- a/uriloader/exthandler/ExternalHelperAppParent.h
+++ b/uriloader/exthandler/ExternalHelperAppParent.h
@@ -86,19 +86,18 @@ class ExternalHelperAppParent
 
   ExternalHelperAppParent(
       const OptionalURIParams& uri,
       const mozilla::net::OptionalLoadInfoArgs& aLoadInfoArgs,
       const int64_t& contentLength, const bool& wasFileChannel,
       const nsCString& aContentDispositionHeader,
       const uint32_t& aContentDispositionHint,
       const nsString& aContentDispositionFilename);
-  void Init(ContentParent* parent, const nsCString& aMimeContentType,
-            const bool& aForceSave, const OptionalURIParams& aReferrer,
-            PBrowserParent* aBrowser);
+  void Init(const nsCString& aMimeContentType, const bool& aForceSave,
+            const OptionalURIParams& aReferrer, PBrowserParent* aBrowser);
 
  protected:
   virtual ~ExternalHelperAppParent();
 
   virtual void ActorDestroy(ActorDestroyReason why) override;
   void Delete();
 
  private: