Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 07:15:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 86734: Remove NS_WITH_SERVICE. r=dbaron, rs=scc, a=asa

Browse Source
This commit is contained in:
jaggernaut%netscape.com 2006-04-20 03:37:27 +00:00
parent c193c9f9a3
commit b675f03deb
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
content/base/src/nsDOMParser.cpp
View File

@ -285,10 +285,8 @@ ConvertWStringToStream(const PRUnichar* aStr,
char* charBuf;
// We want to encode the string as utf-8, so get the right encoder
NS_WITH_SERVICE(nsICharsetConverterManager,
charsetConv,
kCharsetConverterManagerCID,
&rv);
nsCOMPtr<nsICharsetConverterManager> charsetConv =
do_GetService(kCharsetConverterManagerCID, &rv);
NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE);
charsetStr.AssignWithConversion("UTF-8");
@ -381,7 +379,7 @@ nsDOMParser::ParseFromStream(nsIInputStream *stream,
// First try to find a base URI for the document we're creating
nsCOMPtr<nsIXPCNativeCallContext> cc;
NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv);
nsCOMPtr<nsIXPConnect> xpc(do_GetService(nsIXPConnect::GetCID(), &rv));
if(NS_SUCCEEDED(rv)) {
rv = xpc->GetCurrentNativeCallContext(getter_AddRefs(cc));
}
@ -391,8 +389,8 @@ nsDOMParser::ParseFromStream(nsIInputStream *stream,
rv = cc->GetJSContext(&cx);
if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
NS_WITH_SERVICE(nsIScriptSecurityManager, secMan,
NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv);
nsCOMPtr<nsIScriptSecurityManager> secMan =
do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv);
if (NS_SUCCEEDED(rv)) {
rv = secMan->GetSubjectPrincipal(getter_AddRefs(principal));
if (NS_SUCCEEDED(rv)) {

16
content/base/src/nsXMLHttpRequest.cpp
View File

@ -676,7 +676,7 @@ nsXMLHttpRequest::Open(const char *method, const char *url)
char* password = nsnull;
nsCOMPtr<nsIXPCNativeCallContext> cc;
NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv);
nsCOMPtr<nsIXPConnect> xpc(do_GetService(nsIXPConnect::GetCID(), &rv));
if(NS_SUCCEEDED(rv)) {
rv = xpc->GetCurrentNativeCallContext(getter_AddRefs(cc));
}
@ -694,8 +694,8 @@ nsXMLHttpRequest::Open(const char *method, const char *url)
rv = cc->GetJSContext(&cx);
if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
NS_WITH_SERVICE(nsIScriptSecurityManager, secMan,
NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv);
nsCOMPtr<nsIScriptSecurityManager> secMan =
do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv);
if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
nsCOMPtr<nsIPrincipal> principal;
@ -717,7 +717,7 @@ nsXMLHttpRequest::Open(const char *method, const char *url)
// Security check failed. The above call set a JS exception. The
// following lines ensure that the exception is propagated.
NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv);
nsCOMPtr<nsIXPConnect> xpc(do_GetService(nsIXPConnect::GetCID(), &rv));
nsCOMPtr<nsIXPCNativeCallContext> cc;
if(NS_SUCCEEDED(rv))
xpc->GetCurrentNativeCallContext(getter_AddRefs(cc));
@ -765,10 +765,8 @@ nsXMLHttpRequest::GetStreamForWString(const PRUnichar* aStr,
char* postData;
// We want to encode the string as utf-8, so get the right encoder
NS_WITH_SERVICE(nsICharsetConverterManager,
charsetConv,
kCharsetConverterManagerCID,
&rv);
nsCOMPtr<nsICharsetConverterManager> charsetConv =
do_GetService(kCharsetConverterManagerCID, &rv);
NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE);
charsetStr.AssignWithConversion("UTF-8");
@ -1023,7 +1021,7 @@ nsXMLHttpRequest::Send(nsISupports *body)
if (!mAsync) {
nsCOMPtr<nsIXPCNativeCallContext> cc;
NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv);
nsCOMPtr<nsIXPConnect> xpc(do_GetService(nsIXPConnect::GetCID(), &rv));
if(NS_SUCCEEDED(rv)) {
rv = xpc->GetCurrentNativeCallContext(getter_AddRefs(cc));
}