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 581341 - Part 6: Nits. r=bent

Browse Source
This commit is contained in:
Josh Matthews 2011-06-29 13:20:43 -04:00
parent 2d89b875c9
commit 4737501d88
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dom/ipc/ContentParent.cpp
View File

@ -330,8 +330,9 @@ ContentParent::DestroyTestShell(TestShellParent* aTestShell)
TestShellParent*
ContentParent::GetTestShellSingleton()
{
if (!ManagedPTestShellParent().Length())
if (ManagedPTestShellParent().IsEmpty()) {
return nsnull;
}
return static_cast<TestShellParent*>(ManagedPTestShellParent()[0]);
}

10
toolkit/xre/nsEmbedFunctions.cpp
View File

@ -712,11 +712,11 @@ TestShellParent* GetOrCreateTestShellParent()
if (!parent) {
return nsnull;
}
TestShellParent* testShell = parent->GetTestShellSingleton();
if (testShell) {
return testShell;
if (!testShell) {
testShell = parent->CreateTestShell();
}
testShell = parent->CreateTestShell();
return testShell;
}
}
@ -758,9 +758,7 @@ XRE_ShutdownTestShell()
{
ContentParent* cp = ContentParent::GetSingleton(PR_FALSE);
TestShellParent* tsp = cp ? cp->GetTestShellSingleton() : nsnull;
if (!tsp)
return true;
return cp->DestroyTestShell(tsp);
return tsp ? cp->DestroyTestShell(tsp) : true;
}
#ifdef MOZ_X11