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

deCOMtaminate nsIDocument by changing methods to use return value instead of out-params, eliminating unused nsresult return values, moving some members to nsIDocument and inlining the getters/setters. Bug 222134, r=bzbarsky, sr=jst.

Browse Source
This commit is contained in:
bryner@brianryner.com
2003-10-22 06:09:48 +00:00
parent 92e18607e3
commit 1f9609e30b
184 changed files with 1473 additions and 2665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -172,16 +172,14 @@ nsFrameLoader::LoadFrame()
}
// Make an absolute URI
nsCOMPtr<nsIURI> base_uri;
doc->GetBaseURL(getter_AddRefs(base_uri));
nsIURI *base_uri = doc->GetBaseURL();
nsCAutoString doc_charset;
doc->GetDocumentCharacterSet(doc_charset);
const nsACString &doc_charset = doc->GetDocumentCharacterSet();
nsCOMPtr<nsIURI> uri;
rv = NS_NewURI(getter_AddRefs(uri), src,
doc_charset.IsEmpty() ? nsnull :
doc_charset.get(), base_uri);
PromiseFlatCString(doc_charset).get(), base_uri);
NS_ENSURE_SUCCESS(rv, rv);
// Check for security
@@ -376,7 +374,7 @@ nsFrameLoader::GetPresContext(nsIPresContext **aPresContext)
{
*aPresContext = nsnull;
nsCOMPtr<nsIDocument> doc = mOwnerContent->GetDocument();
nsIDocument* doc = mOwnerContent->GetDocument();
while (doc) {
nsIPresShell *presShell = doc->GetShellAt(0);
@@ -387,10 +385,7 @@ nsFrameLoader::GetPresContext(nsIPresContext **aPresContext)
return NS_OK;
}
nsCOMPtr<nsIDocument> parent;
doc->GetParentDocument(getter_AddRefs(parent));
doc = parent;
doc = doc->GetParentDocument();
}
return NS_OK;