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

Convert javaxpcom from using the (now-removed) XPTI_GetInterfaceInfoManager to use do_GetService, moa=jhpedemonte, from bug 315401

Browse Source 
Original committer: bsmedberg%covad.net
Original revision: 1.36
Original date: 2005/11/10 20:09:22


git-svn-id: svn://10.0.0.236/trunk@212697 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pedemont%us.ibm.com 2006-09-27 15:19:01 +00:00
parent b57b3d5299
commit 0e78654aa2
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mozilla/extensions/java/xpcom/src/nsJavaWrapper.cpp
View File

@ -44,6 +44,7 @@
#include "nsString.h"
#include "nsCRT.h"
#include "prmem.h"
#include "nsServiceManagerUtils.h"
#define JAVAPROXY_NATIVE(func) \
Java_org_mozilla_xpcom_internal_XPCOMJavaProxy_##func
@ -109,9 +110,9 @@ CreateJavaArray(JNIEnv* env, PRUint8 aType, PRUint32 aSize, const nsID& aIID,
case nsXPTType::T_INTERFACE:
case nsXPTType::T_INTERFACE_IS:
{
nsCOMPtr<nsIInterfaceInfoManager> iim =
getter_AddRefs(XPTI_GetInterfaceInfoManager());
NS_ASSERTION(iim != nsnull, "Failed to get InterfaceInfoManager");
nsCOMPtr<nsIInterfaceInfoManager>
iim(do_GetService(NS_INTERFACEINFOMANAGER_SERVICE_CONTRACTID));
NS_ASSERTION(iim, "Failed to get InterfaceInfoManager");
if (!iim)
return NS_ERROR_FAILURE;
@ -1618,9 +1619,9 @@ CreateJavaProxy(JNIEnv* env, nsISupports* aXPCOMObject, const nsIID& aIID,
if (!aResult)
return NS_ERROR_NULL_POINTER;
nsCOMPtr<nsIInterfaceInfoManager> iim =
getter_AddRefs(XPTI_GetInterfaceInfoManager());
NS_ASSERTION(iim != nsnull, "Failed to get InterfaceInfoManager");
nsCOMPtr<nsIInterfaceInfoManager>
iim(do_GetService(NS_INTERFACEINFOMANAGER_SERVICE_CONTRACTID));
NS_ASSERTION(iim, "Failed to get InterfaceInfoManager");
if (!iim)
return NS_ERROR_FAILURE;

6
mozilla/extensions/java/xpcom/src/nsJavaXPCOMBindingUtils.cpp
View File

@ -796,8 +796,10 @@ GetNewOrUsedXPCOMObject(JNIEnv* env, jobject aJavaObject, const nsIID& aIID,
// create an XPCOM stub, that can route any method calls to the class.
// Get interface info for class
nsCOMPtr<nsIInterfaceInfoManager> iim =
getter_AddRefs(XPTI_GetInterfaceInfoManager());
nsCOMPtr<nsIInterfaceInfoManager>
iim(do_GetService(NS_INTERFACEINFOMANAGER_SERVICE_CONTRACTID, &rv));
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIInterfaceInfo> iinfo;
rv = iim->GetInfoForIID(&aIID, getter_AddRefs(iinfo));
if (NS_FAILED(rv))