Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FrameFrame code cleanup...

Browse Source 
git-svn-id: svn://10.0.0.236/branches/IFRAME_20020207_BRANCH@116043 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jst%netscape.com
2002-03-07 08:13:34 +00:00
parent a5fbc363fe
commit af48a42b5f
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mozilla/layout/html/document/src/nsFrameFrame.cpp
View File

@@ -893,17 +893,17 @@ nsHTMLFrameInnerFrame::GetDocShell(nsIDocShell **aDocShell)
{
*aDocShell = nsnull;
nsIFrame* parent = nsnull;
GetParent(&parent);
nsCOMPtr<nsIContent> content;
GetParentContent(getter_AddRefs(content));
if (!content) {
// Hmm, no content in this frame (or in the parent, really),
// that's odd, not much to be done here then.
if (!parent) {
return NS_OK;
}
if (!mFrameLoader) {
nsCOMPtr<nsIContent> content;
parent->GetContent(getter_AddRefs(content));
nsCOMPtr<nsIFrameLoaderOwner> frame_loader_owner =
do_QueryInterface(content);
@@ -912,18 +912,18 @@ nsHTMLFrameInnerFrame::GetDocShell(nsIDocShell **aDocShell)
}
if (!mFrameLoader) {
// No frame loader available from the content, create our own...
nsresult rv = NS_OK;
// No frame loader available from the content, create our own...
mFrameLoader = do_CreateInstance(NS_FRAMELOADER_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
mFrameLoader->Init(content);
// ... and tell it to start loading.
// ... and tell it to start loading...
mFrameLoader->LoadFrame();
// ... and remember that we own this frame loader.
mOwnsFrameLoader = PR_TRUE;
}
}