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

fix for bug 13426 - can now do 'new Components.classes.foo()' to create a new instance of a wrapped native

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@48380 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jband%netscape.com 1999-09-20 20:59:38 +00:00
parent a6151a4aa7
commit 553afd024f
3 changed files with 58 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mozilla/js/src/xpconnect/src/xpccomponents.cpp
View File

@ -246,7 +246,8 @@ nsXPCInterfaces::CacheDynaProp(JSContext *cx, JSObject *obj, jsid id,
nsXPConnect* xpc = nsXPConnect::GetXPConnect();
if(xpc)
{
if(NS_SUCCEEDED(xpc->WrapNative(cx, NS_STATIC_CAST(nsIJSID*,nsid),
if(NS_SUCCEEDED(xpc->WrapNative(cx,
NS_STATIC_CAST(nsIJSID*,nsid),
NS_GET_IID(nsIJSIID),
&nsid_wrapper)))
{
@ -482,7 +483,8 @@ nsXPCClasses::CacheDynaProp(JSContext *cx, JSObject *obj, jsid id,
nsXPConnect* xpc = nsXPConnect::GetXPConnect();
if(xpc)
{
if(NS_SUCCEEDED(xpc->WrapNative(cx, nsid,
if(NS_SUCCEEDED(xpc->WrapNative(cx,
NS_STATIC_CAST(nsIJSID*,nsid),
nsIJSCID::GetIID(),
&nsid_wrapper)))
{
@ -757,7 +759,8 @@ nsXPCClassesByID::CacheDynaProp(JSContext *cx, JSObject *obj, jsid id,
nsXPConnect* xpc = nsXPConnect::GetXPConnect();
if(xpc)
{
if(NS_SUCCEEDED(xpc->WrapNative(cx, nsid,
if(NS_SUCCEEDED(xpc->WrapNative(cx,
NS_STATIC_CAST(nsIJSID*,nsid),
nsIJSCID::GetIID(),
&nsid_wrapper)))
{

67
mozilla/js/src/xpconnect/src/xpcjsid.cpp
View File

@ -181,7 +181,7 @@ nsJSID::InitWithName(const nsID& id, const char *nameString)
Reset();
mID = id;
return SetName(nameString);
}
}
// try to use the name, if no name, then use the number
NS_IMETHODIMP
@ -255,8 +255,8 @@ XPC_IMPLEMENT_IGNORE_CONSTRUCT(nsJSIID)
// XPC_IMPLEMENT_FORWARD_HASINSTANCE(nsJSIID)
XPC_IMPLEMENT_FORWARD_FINALIZE(nsJSIID)
nsJSIID::nsJSIID()
: mCacheFilled(JS_FALSE)
nsJSIID::nsJSIID()
: mCacheFilled(JS_FALSE)
{
NS_INIT_ISUPPORTS();
}
@ -350,14 +350,14 @@ nsJSIID::NewID(const char* str)
return idObj;
}
NS_IMETHODIMP
NS_IMETHODIMP
nsJSIID::HasInstance(JSContext *cx, JSObject *obj,
jsval v, JSBool *bp,
nsIXPConnectWrappedNative* wrapper,
nsIXPCScriptable* arbitrary,
JSBool* retval)
{
*bp = JS_FALSE;
*bp = JS_FALSE;
*retval = JS_TRUE;
nsresult rv = NS_OK;
@ -402,7 +402,7 @@ nsJSIID::HasInstance(JSContext *cx, JSObject *obj,
if(found)
{
*bp = JS_TRUE;
break;
break;
}
}
else
@ -594,15 +594,11 @@ CIDCreateInstance::Call(JSContext *cx, JSObject *obj,
nsIXPCScriptable* arbitrary,
JSBool* retval)
{
CIDCreateInstance* self;
nsJSCID* cidObj;
nsCID* cid;
PRBool valid;
if(NS_FAILED(wrapper->GetNative((nsISupports**)&self)))
return NS_ERROR_FAILURE;
if(!(cidObj = self->GetCID()) ||
if(!(cidObj = GetCID()) ||
NS_FAILED(cidObj->GetValid(&valid)) ||
!valid ||
NS_FAILED(cidObj->GetId(&cid)) ||
@ -794,15 +790,11 @@ CIDGetService::Call(JSContext *cx, JSObject *obj,
nsIXPCScriptable* arbitrary,
JSBool* retval)
{
CIDGetService* self;
nsJSCID* cidObj;
nsCID* cid;
PRBool valid;
if(NS_FAILED(wrapper->GetNative((nsISupports**)&self)))
return NS_ERROR_FAILURE;
if(!(cidObj = self->GetCID()) ||
if(!(cidObj = GetCID()) ||
NS_FAILED(cidObj->GetValid(&valid)) ||
!valid ||
NS_FAILED(cidObj->GetId(&cid)) ||
@ -909,7 +901,25 @@ CIDGetService::Call(JSContext *cx, JSObject *obj,
/***************************************************************************/
/***************************************************************************/
NS_IMPL_ISUPPORTS2(nsJSCID, nsIJSID, nsIJSCID)
NS_IMPL_ISUPPORTS3(nsJSCID, nsIJSID, nsIJSCID, nsIXPCScriptable)
XPC_IMPLEMENT_FORWARD_CREATE(nsJSCID)
XPC_IMPLEMENT_IGNORE_GETFLAGS(nsJSCID)
XPC_IMPLEMENT_IGNORE_LOOKUPPROPERTY(nsJSCID)
XPC_IMPLEMENT_IGNORE_DEFINEPROPERTY(nsJSCID)
XPC_IMPLEMENT_IGNORE_GETPROPERTY(nsJSCID)
XPC_IMPLEMENT_IGNORE_SETPROPERTY(nsJSCID)
XPC_IMPLEMENT_IGNORE_GETATTRIBUTES(nsJSCID)
XPC_IMPLEMENT_IGNORE_SETATTRIBUTES(nsJSCID)
XPC_IMPLEMENT_IGNORE_DELETEPROPERTY(nsJSCID)
XPC_IMPLEMENT_FORWARD_DEFAULTVALUE(nsJSCID)
XPC_IMPLEMENT_FORWARD_ENUMERATE(nsJSCID)
XPC_IMPLEMENT_IGNORE_CHECKACCESS(nsJSCID)
XPC_IMPLEMENT_IGNORE_CALL(nsJSCID)
// XPC_IMPLEMENT_IGNORE_CONSTRUCT(nsJSCID)
XPC_IMPLEMENT_FORWARD_HASINSTANCE(nsJSCID)
XPC_IMPLEMENT_FORWARD_FINALIZE(nsJSCID)
nsJSCID::nsJSCID() {NS_INIT_ISUPPORTS();}
nsJSCID::~nsJSCID() {}
@ -1004,6 +1014,29 @@ nsJSCID::GetGetService(nsISupports * *aGetService)
return NS_OK;
}
NS_IMETHODIMP
nsJSCID::Construct(JSContext *cx, JSObject *obj,
uintN argc, jsval *argv,
jsval *rval,
nsIXPConnectWrappedNative* wrapper,
nsIXPCScriptable* arbitrary,
JSBool* retval)
{
nsIXPCScriptable *ci;
CIDCreateInstance *p;
if(nsnull == (p = new CIDCreateInstance(this)) ||
NS_FAILED(p->QueryInterface(NS_GET_IID(nsIXPCScriptable),(void**)&ci)))
{
ThrowException(NS_ERROR_OUT_OF_MEMORY, cx);
*retval = JS_FALSE;
return NS_OK;
}
nsresult rv = ci->Call(cx, obj, argc, argv, rval,
wrapper, arbitrary, retval);
NS_RELEASE(ci);
return rv;
}
/***************************************************************************/
// additional utilities...

3
mozilla/js/src/xpconnect/src/xpcprivate.h
View File

@ -867,7 +867,7 @@ private:
// nsJSCID
class nsJSCID : public nsIJSCID
class nsJSCID : public nsIJSCID, public nsIXPCScriptable
{
public:
NS_DECL_ISUPPORTS
@ -877,6 +877,7 @@ public:
// we implement the rest...
NS_DECL_NSIJSCID
XPC_DECLARE_IXPCSCRIPTABLE
static nsJSCID* NewID(const char* str);