corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

b=545237 Notify PIFrameEmbedding's owner on actor deletion r=bsmedberg

Browse Source
This commit is contained in:
Josh Matthews
2010-04-12 12:34:02 +12:00
parent d6970cc892
commit f28bd68d93
4 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
content/base/src/nsFrameLoader.cpp
View File

@@ -1069,6 +1069,18 @@ nsFrameLoader::SwapWithOtherLoader(nsFrameLoader* aOther,
return NS_OK;
}
void
nsFrameLoader::DestroyChild()
{
#ifdef MOZ_IPC
if (mChildProcess) {
mChildProcess->SetOwnerElement(nsnull);
PIFrameEmbeddingParent::Send__delete__(mChildProcess);
mChildProcess = nsnull;
}
#endif
}
NS_IMETHODIMP
nsFrameLoader::Destroy()
{
@@ -1087,14 +1099,8 @@ nsFrameLoader::Destroy()
mOwnerContent = nsnull;
}
#ifdef MOZ_IPC
if (mChildProcess) {
mChildProcess->SetOwnerElement(nsnull);
PIFrameEmbeddingParent::Send__delete__(mChildProcess);
mChildProcess = nsnull;
}
#endif
DestroyChild();
// Let the tree owner know we're gone.
if (mIsTopLevelContent) {
nsCOMPtr<nsIDocShellTreeItem> ourItem = do_QueryInterface(mDocShell);