wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 847656: Change ContentParent::GetNewOrUsed to return an already_AddRefed value. r=khuey

Browse Source
This commit is contained in:
Jim Blandy 2013-04-02 16:52:51 -07:00
parent 04fd0a18b7
commit 9ed989eae8
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dom/ipc/ContentParent.cpp
View File

@ -370,7 +370,7 @@ ContentParent::JoinAllSubprocesses()
sCanLaunchSubprocesses = false;
}
/*static*/ ContentParent*
/*static*/ already_AddRefed<ContentParent>
ContentParent::GetNewOrUsed(bool aForBrowserElement)
{
if (!gNonAppContentParents)
@ -382,9 +382,9 @@ ContentParent::GetNewOrUsed(bool aForBrowserElement)
if (gNonAppContentParents->Length() >= uint32_t(maxContentProcesses)) {
uint32_t idx = rand() % gNonAppContentParents->Length();
ContentParent* p = (*gNonAppContentParents)[idx];
nsRefPtr<ContentParent> p = (*gNonAppContentParents)[idx];
NS_ASSERTION(p->IsAlive(), "Non-alive contentparent in gNonAppContentParents?");
return p;
return p.forget();
}
nsRefPtr<ContentParent> p =
@ -394,7 +394,7 @@ ContentParent::GetNewOrUsed(bool aForBrowserElement)
PROCESS_PRIORITY_FOREGROUND);
p->Init();
gNonAppContentParents->AppendElement(p);
return p;
return p.forget();
}
namespace {
@ -462,7 +462,7 @@ ContentParent::CreateBrowserOrApp(const TabContext& aContext,
}
if (aContext.IsBrowserElement() || !aContext.HasOwnApp()) {
if (ContentParent* cp = GetNewOrUsed(aContext.IsBrowserElement())) {
if (nsRefPtr<ContentParent> cp = GetNewOrUsed(aContext.IsBrowserElement())) {
nsRefPtr<TabParent> tp(new TabParent(aContext));
tp->SetOwnerElement(aFrameElement);
PBrowserParent* browser = cp->SendPBrowserConstructor(

3
dom/ipc/ContentParent.h
View File

@ -81,7 +81,8 @@ public:
*/
static void JoinAllSubprocesses();
static ContentParent* GetNewOrUsed(bool aForBrowserElement = false);
static already_AddRefed<ContentParent>
GetNewOrUsed(bool aForBrowserElement = false);
/**
* Get or create a content process for the given TabContext. aFrameElement

2
toolkit/xre/nsAppRunner.cpp
View File

@ -780,7 +780,7 @@ nsXULAppInfo::EnsureContentProcess()
if (XRE_GetProcessType() != GeckoProcessType_Default)
return NS_ERROR_NOT_AVAILABLE;
unused << ContentParent::GetNewOrUsed();
nsRefPtr<ContentParent> unused = ContentParent::GetNewOrUsed();
return NS_OK;
}

3
toolkit/xre/nsEmbedFunctions.cpp
View File

@ -695,7 +695,8 @@ ContentParent* gContentParent; //long-lived, manually refcounted
TestShellParent* GetOrCreateTestShellParent()
{
if (!gContentParent) {
NS_ADDREF(gContentParent = ContentParent::GetNewOrUsed());
nsRefPtr<ContentParent> parent = ContentParent::GetNewOrUsed().get();
parent.forget(&gContentParent);
} else if (!gContentParent->IsAlive()) {
return nullptr;
}