Bug 1279503 - part 1 - removed a non-used variable in BrowserConfiguration, r=gabor, a=gchang
authorAndrea Marchesini <amarchesini@mozilla.com>
Mon, 11 Jul 2016 00:28:10 +0200
changeset 339999 b181b014c3649d14e696f4a42865a3a7aab4a4e9
parent 339998 20fca29df10323bb0bd8f8af43cecfcd85484e46
child 340000 aa3cda908cd8e68ee429a293e9683629543af7f1
push id6249
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 13:59:36 +0000
treeherdermozilla-beta@bad9d4f5bf7e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgabor, gchang
bugs1279503
milestone49.0a2
Bug 1279503 - part 1 - removed a non-used variable in BrowserConfiguration, r=gabor, a=gchang
dom/ipc/ContentParent.cpp
dom/ipc/ContentParent.h
dom/ipc/PContent.ipdl
dom/ipc/TabParent.cpp
dom/ipc/TabParent.h
--- a/dom/ipc/ContentParent.cpp
+++ b/dom/ipc/ContentParent.cpp
@@ -5634,35 +5634,35 @@ ContentParent::PermissionManagerRelease(
   if (appId != nsIScriptSecurityManager::NO_APP_ID && permMgr) {
     permMgr->ReleaseAppId(appId);
     return true;
   }
   return false;
 }
 
 bool
-ContentParent::RecvGetBrowserConfiguration(const nsCString& aURI, BrowserConfiguration* aConfig)
+ContentParent::RecvGetBrowserConfiguration(BrowserConfiguration* aConfig)
 {
   MOZ_ASSERT(XRE_IsParentProcess());
 
-  return GetBrowserConfiguration(aURI, *aConfig);;
+  return GetBrowserConfiguration(*aConfig);
 }
 
 /*static*/ bool
-ContentParent::GetBrowserConfiguration(const nsCString& aURI, BrowserConfiguration& aConfig)
+ContentParent::GetBrowserConfiguration(BrowserConfiguration& aConfig)
 {
   if (XRE_IsParentProcess()) {
     RefPtr<ServiceWorkerRegistrar> swr = ServiceWorkerRegistrar::Get();
     MOZ_ASSERT(swr);
 
     swr->GetRegistrations(aConfig.serviceWorkerRegistrations());
     return true;
   }
 
-  return ContentChild::GetSingleton()->SendGetBrowserConfiguration(aURI, &aConfig);
+  return ContentChild::GetSingleton()->SendGetBrowserConfiguration(&aConfig);
 }
 
 bool
 ContentParent::RecvGamepadListenerAdded()
 {
 #ifdef MOZ_GAMEPAD
   if (mHasGamepadListener) {
     NS_WARNING("Gamepad listener already started, cannot start again!");
--- a/dom/ipc/ContentParent.h
+++ b/dom/ipc/ContentParent.h
@@ -349,17 +349,17 @@ public:
 
   /*
    * Release the appId's reference count by the given ContentParentId and TabId
    */
   static bool
   PermissionManagerRelease(const ContentParentId& aCpId, const TabId& aTabId);
 
   static bool
-  GetBrowserConfiguration(const nsCString& aURI, BrowserConfiguration& aConfig);
+  GetBrowserConfiguration(BrowserConfiguration& aConfig);
 
   void ReportChildAlreadyBlocked();
 
   bool RequestRunToCompletion();
 
   bool IsAlive() const;
 
   virtual bool IsForApp() const override;
@@ -1141,18 +1141,17 @@ private:
 
   virtual PWebrtcGlobalParent* AllocPWebrtcGlobalParent() override;
   virtual bool DeallocPWebrtcGlobalParent(PWebrtcGlobalParent *aActor) override;
 
 
   virtual bool RecvUpdateDropEffect(const uint32_t& aDragAction,
                                     const uint32_t& aDropEffect) override;
 
-  virtual bool RecvGetBrowserConfiguration(const nsCString& aURI,
-                                           BrowserConfiguration* aConfig) override;
+  virtual bool RecvGetBrowserConfiguration(BrowserConfiguration* aConfig) override;
 
   virtual bool RecvGamepadListenerAdded() override;
 
   virtual bool RecvGamepadListenerRemoved() override;
 
   virtual bool RecvProfile(const nsCString& aProfile) override;
 
   virtual bool RecvGetGraphicsDeviceInitData(DeviceInitData* aOut) override;
--- a/dom/ipc/PContent.ipdl
+++ b/dom/ipc/PContent.ipdl
@@ -1118,17 +1118,17 @@ parent:
      *       provided.
      */
     async PContentPermissionRequest(PermissionRequest[] aRequests, Principal aPrincipal,
                                     TabId tabId);
 
     /**
      * Send ServiceWorkerRegistrationData to child process.
      */
-    sync GetBrowserConfiguration(nsCString aUri)
+    sync GetBrowserConfiguration()
         returns (BrowserConfiguration aConfig);
 
     /*
      * Tells the parent to start the gamepad listening service if it hasn't already.
      */
     async GamepadListenerAdded();
 
     /**
--- a/dom/ipc/TabParent.cpp
+++ b/dom/ipc/TabParent.cpp
@@ -693,20 +693,19 @@ TabParent::SendLoadRemoteScript(const ns
     return true;
   }
 
   MOZ_ASSERT(mDelayedFrameScripts.IsEmpty());
   return PBrowserParent::SendLoadRemoteScript(aURL, aRunInGlobalScope);
 }
 
 bool
-TabParent::InitBrowserConfiguration(const nsCString& aURI,
-                                    BrowserConfiguration& aConfiguration)
+TabParent::InitBrowserConfiguration(BrowserConfiguration& aConfiguration)
 {
-  return ContentParent::GetBrowserConfiguration(aURI, aConfiguration);
+  return ContentParent::GetBrowserConfiguration(aConfiguration);
 }
 
 void
 TabParent::LoadURL(nsIURI* aURI)
 {
     MOZ_ASSERT(aURI);
 
     if (mIsDestroyed) {
@@ -728,17 +727,17 @@ TabParent::LoadURL(nsIURI* aURI)
       // If the app is offline in the parent process
       // pass that state to the child process as well
       Unused << SendAppOfflineStatus(appId, true);
     }
     mSendOfflineStatus = false;
 
     // This object contains the configuration for this new app.
     BrowserConfiguration configuration;
-    if (NS_WARN_IF(!InitBrowserConfiguration(spec, configuration))) {
+    if (NS_WARN_IF(!InitBrowserConfiguration(configuration))) {
       return;
     }
 
     Unused << SendLoadURL(spec, configuration, GetShowInfo());
 
     // If this app is a packaged app then we can speed startup by sending over
     // the file descriptor for the "application.zip" file that it will
     // invariably request. Only do this once.
--- a/dom/ipc/TabParent.h
+++ b/dom/ipc/TabParent.h
@@ -643,18 +643,17 @@ protected:
                                  const int32_t& aX, const int32_t& aY,
                                  const int32_t& aCx, const int32_t& aCy) override;
 
   virtual bool RecvGetTabCount(uint32_t* aValue) override;
 
   virtual bool RecvAudioChannelActivityNotification(const uint32_t& aAudioChannel,
                                                     const bool& aActive) override;
 
-  bool InitBrowserConfiguration(const nsCString& aURI,
-                                BrowserConfiguration& aConfiguration);
+  bool InitBrowserConfiguration(BrowserConfiguration& aConfiguration);
 
   ContentCacheInParent mContentCache;
 
   nsIntRect mRect;
   ScreenIntSize mDimensions;
   ScreenOrientationInternal mOrientation;
   float mDPI;
   CSSToLayoutDeviceScale mDefaultScale;