Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 21:35:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1279503 - part 1 - removed a non-used variable in BrowserConfiguration, r=gabor

Browse Source
This commit is contained in:
Andrea Marchesini 2016-07-11 00:28:10 +02:00
parent 13348e25c7
commit 0e242f0ac7
5 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dom/ipc/ContentParent.cpp
View File

@ -5505,15 +5505,15 @@ ContentParent::PermissionManagerRelease(const ContentParentId& aCpId,
}
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();
@ -5523,7 +5523,7 @@ ContentParent::GetBrowserConfiguration(const nsCString& aURI, BrowserConfigurati
return true;
}
return ContentChild::GetSingleton()->SendGetBrowserConfiguration(aURI, &aConfig);
return ContentChild::GetSingleton()->SendGetBrowserConfiguration(&aConfig);
}
bool

5
dom/ipc/ContentParent.h
View File

@ -354,7 +354,7 @@ public:
PermissionManagerRelease(const ContentParentId& aCpId, const TabId& aTabId);
static bool
GetBrowserConfiguration(const nsCString& aURI, BrowserConfiguration& aConfig);
GetBrowserConfiguration(BrowserConfiguration& aConfig);
void ReportChildAlreadyBlocked();
@ -1138,8 +1138,7 @@ private:
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 RecvProfile(const nsCString& aProfile) override;

2
dom/ipc/PContent.ipdl
View File

@ -1087,7 +1087,7 @@ parent:
/**
* Send ServiceWorkerRegistrationData to child process.
*/
sync GetBrowserConfiguration(nsCString aUri)
sync GetBrowserConfiguration()
returns (BrowserConfiguration aConfig);
async Profile(nsCString aProfile);

7
dom/ipc/TabParent.cpp
View File

@ -720,10 +720,9 @@ TabParent::SendLoadRemoteScript(const nsString& aURL,
}
bool
TabParent::InitBrowserConfiguration(const nsCString& aURI,
BrowserConfiguration& aConfiguration)
TabParent::InitBrowserConfiguration(BrowserConfiguration& aConfiguration)
{
return ContentParent::GetBrowserConfiguration(aURI, aConfiguration);
return ContentParent::GetBrowserConfiguration(aConfiguration);
}
void
@ -755,7 +754,7 @@ TabParent::LoadURL(nsIURI* aURI)
// 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;
}

3
dom/ipc/TabParent.h
View File

@ -653,8 +653,7 @@ protected:
virtual bool RecvAudioChannelActivityNotification(const uint32_t& aAudioChannel,
const bool& aActive) override;
bool InitBrowserConfiguration(const nsCString& aURI,
BrowserConfiguration& aConfiguration);
bool InitBrowserConfiguration(BrowserConfiguration& aConfiguration);
ContentCacheInParent mContentCache;