Bommels05/Mozilla
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 
git-svn-id: svn://10.0.0.236/trunk@194870 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bryner%brianryner.com
2006-04-20 03:38:41 +00:00
parent 6af9278f8c
commit 6849297bf8
3 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/content/base/src/nsXMLHttpRequest.cpp
View File

@@ -402,9 +402,7 @@ nsXMLHttpRequest::ConvertBodyToText(PRUnichar **aOutBuffer)
nsCAutoString dataCharset;
nsCOMPtr<nsIDocument> document(do_QueryInterface(mDocument));
if (document) {
rv = document->GetDocumentCharacterSet(dataCharset);
if (NS_FAILED(rv))
return rv;
dataCharset = document->GetDocumentCharacterSet();
} else {
if (NS_FAILED(DetectCharset(dataCharset)) || dataCharset.IsEmpty()) {
// MS documentation states UTF-8 is default for responseText
@@ -609,7 +607,7 @@ nsXMLHttpRequest::GetLoadGroup(nsILoadGroup **aLoadGroup)
nsCOMPtr<nsIDocument> doc = GetDocumentFromScriptContext(mScriptContext);
if (doc) {
doc->GetDocumentLoadGroup(aLoadGroup);
*aLoadGroup = doc->GetDocumentLoadGroup().get(); // already_AddRefed
}
return NS_OK;
@@ -630,7 +628,7 @@ nsXMLHttpRequest::GetBaseURI(nsIURI **aBaseURI)
nsCOMPtr<nsIDocument> doc = GetDocumentFromScriptContext(mScriptContext);
if (doc) {
doc->GetBaseURL(aBaseURI);
NS_IF_ADDREF(*aBaseURI = doc->GetBaseURL());
}
return NS_OK;