Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-12 00:50:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge to tip for backout of bug 461566.

Browse Source
This commit is contained in:
Shawn Wilsher 2008-11-27 20:33:33 -08:00
commit 0378e8f16c
11 changed files with 76 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
dom/src/base/nsDOMClassInfo.cpp
View File

@ -1637,7 +1637,7 @@ nsDOMClassInfo::DefineStaticJSVals(JSContext *cx)
// static
nsresult
nsDOMClassInfo::WrapNative(JSContext *cx, JSObject *scope, nsISupports *native,
const nsIID* aIID, jsval *vp,
const nsIID& aIID, jsval *vp,
nsIXPConnectJSObjectHolder **aHolder)
{
if (!native) {
@ -1682,7 +1682,7 @@ nsDOMClassInfo::ThrowJSException(JSContext *cx, nsresult aResult)
jsval jv;
nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
rv = WrapNative(cx, ::JS_GetGlobalObject(cx), exception,
&NS_GET_IID(nsIException), &jv, getter_AddRefs(holder));
NS_GET_IID(nsIException), &jv, getter_AddRefs(holder));
if (NS_FAILED(rv) || JSVAL_IS_NULL(jv)) {
break;
}
@ -4485,7 +4485,8 @@ nsWindowSH::GlobalScopePolluterNewResolve(JSContext *cx, JSObject *obj,
if (result) {
jsval v;
nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
nsresult rv = WrapNative(cx, obj, result, &v, getter_AddRefs(holder));
nsresult rv = WrapNative(cx, obj, result, NS_GET_IID(nsISupports), &v,
getter_AddRefs(holder));
NS_ENSURE_SUCCESS(rv, JS_FALSE);
if (!::JS_DefineUCProperty(cx, obj, ::JS_GetStringChars(jsstr),
@ -4679,7 +4680,7 @@ nsWindowSH::GetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
rv = WrapNative(cx, frameWin->GetGlobalJSObject(), frame,
&NS_GET_IID(nsIDOMWindow), vp,
NS_GET_IID(nsIDOMWindow), vp,
getter_AddRefs(holder));
}
@ -4796,7 +4797,7 @@ nsWindowSH::SetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
NS_ENSURE_TRUE(NS_SUCCEEDED(rv) && location, rv);
nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
rv = WrapNative(cx, obj, location, &NS_GET_IID(nsIDOMLocation), vp,
rv = WrapNative(cx, obj, location, NS_GET_IID(nsIDOMLocation), vp,
getter_AddRefs(holder));
NS_ENSURE_SUCCESS(rv, rv);
@ -5051,8 +5052,8 @@ BaseStubConstructor(nsIWeakReference* aWeakOwner,
}
nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
rv = nsDOMGenericSH::WrapNative(cx, obj, native, rval,
getter_AddRefs(holder));
rv = nsDOMGenericSH::WrapNative(cx, obj, native, NS_GET_IID(nsISupports),
rval, getter_AddRefs(holder));
return rv;
}
@ -5518,7 +5519,7 @@ nsWindowSH::GlobalResolve(nsGlobalWindow *aWin, JSContext *cx,
nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
jsval v;
rv = WrapNative(cx, obj, constructor, &NS_GET_IID(nsIDOMDOMConstructor), &v,
rv = WrapNative(cx, obj, constructor, NS_GET_IID(nsIDOMDOMConstructor), &v,
getter_AddRefs(holder));
sDoSecurityCheckInAddProperty = doSecurityCheckInAddProperty;
@ -5580,7 +5581,7 @@ nsWindowSH::GlobalResolve(nsGlobalWindow *aWin, JSContext *cx,
nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
jsval v;
rv = WrapNative(cx, obj, constructor, &NS_GET_IID(nsIDOMDOMConstructor), &v,
rv = WrapNative(cx, obj, constructor, NS_GET_IID(nsIDOMDOMConstructor), &v,
getter_AddRefs(holder));
sDoSecurityCheckInAddProperty = doSecurityCheckInAddProperty;
@ -5795,7 +5796,7 @@ nsWindowSH::GlobalResolve(nsGlobalWindow *aWin, JSContext *cx,
jsval val;
nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
rv = WrapNative(cx, obj, constructor, &NS_GET_IID(nsIDOMDOMConstructor),
rv = WrapNative(cx, obj, constructor, NS_GET_IID(nsIDOMDOMConstructor),
&val, getter_AddRefs(holder));
NS_ENSURE_SUCCESS(rv, rv);
@ -5843,7 +5844,8 @@ nsWindowSH::GlobalResolve(nsGlobalWindow *aWin, JSContext *cx,
scope = aWin->GetGlobalJSObject();
}
rv = WrapNative(cx, scope, native, &prop_val, getter_AddRefs(holder));
rv = WrapNative(cx, scope, native, NS_GET_IID(nsISupports), &prop_val,
getter_AddRefs(holder));
}
NS_ENSURE_SUCCESS(rv, rv);
@ -6134,7 +6136,7 @@ nsWindowSH::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
jsval v;
nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
rv = WrapNative(cx, wrapperObj, child_win,
&NS_GET_IID(nsIDOMWindowInternal), &v,
NS_GET_IID(nsIDOMWindowInternal), &v,
getter_AddRefs(holder));
NS_ENSURE_SUCCESS(rv, rv);
@ -6255,7 +6257,7 @@ nsWindowSH::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
jsval v;
nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
rv = WrapNative(cx, scope, location, &NS_GET_IID(nsIDOMLocation), &v,
rv = WrapNative(cx, scope, location, NS_GET_IID(nsIDOMLocation), &v,
getter_AddRefs(holder));
NS_ENSURE_SUCCESS(rv, rv);
@ -6312,7 +6314,7 @@ nsWindowSH::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
jsval v;
nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
rv = WrapNative(cx, obj, navigator, &NS_GET_IID(nsIDOMNavigator), &v,
rv = WrapNative(cx, obj, navigator, NS_GET_IID(nsIDOMNavigator), &v,
getter_AddRefs(holder));
NS_ENSURE_SUCCESS(rv, rv);
@ -6336,7 +6338,7 @@ nsWindowSH::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
jsval v;
nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
rv = WrapNative(cx, obj, document, &NS_GET_IID(nsIDOMDocument), &v,
rv = WrapNative(cx, obj, document, NS_GET_IID(nsIDOMDocument), &v,
getter_AddRefs(holder));
NS_ENSURE_SUCCESS(rv, rv);
@ -6940,7 +6942,8 @@ nsNodeSH::PreCreate(nsISupports *nativeObj, JSContext *cx, JSObject *globalObj,
jsval v;
nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
nsresult rv = WrapNative(cx, globalObj, native_parent, &v,
nsresult rv = WrapNative(cx, globalObj, native_parent,
NS_GET_IID(nsISupports), &v,
getter_AddRefs(holder));
*parentObj = JSVAL_TO_OBJECT(v);
@ -7007,7 +7010,7 @@ nsNodeSH::GetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
}
nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
nsresult rv = WrapNative(cx, obj, uri, &NS_GET_IID(nsIURI), vp,
nsresult rv = WrapNative(cx, obj, uri, NS_GET_IID(nsIURI), vp,
getter_AddRefs(holder));
return NS_FAILED(rv) ? rv : NS_SUCCESS_I_DID_SOMETHING;
}
@ -7018,7 +7021,7 @@ nsNodeSH::GetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
nsresult rv = WrapNative(cx, obj, node->NodePrincipal(),
&NS_GET_IID(nsIPrincipal), vp,
NS_GET_IID(nsIPrincipal), vp,
getter_AddRefs(holder));
return NS_FAILED(rv) ? rv : NS_SUCCESS_I_DID_SOMETHING;
}
@ -7716,7 +7719,7 @@ nsArraySH::GetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
NS_ENSURE_SUCCESS(rv, rv);
if (array_item) {
rv = WrapNative(cx, obj, array_item, vp);
rv = WrapNative(cx, obj, array_item, NS_GET_IID(nsISupports), vp);
NS_ENSURE_SUCCESS(rv, rv);
rv = NS_SUCCESS_I_DID_SOMETHING;
@ -7750,7 +7753,8 @@ nsNodeListSH::PreCreate(nsISupports *nativeObj, JSContext *cx,
jsval v;
nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
nsresult rv = WrapNative(cx, globalObj, native_parent, &v,
nsresult rv = WrapNative(cx, globalObj, native_parent,
NS_GET_IID(nsISupports), &v,
getter_AddRefs(holder));
*parentObj = JSVAL_TO_OBJECT(v);
@ -7850,7 +7854,7 @@ nsNamedArraySH::GetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
NS_ENSURE_SUCCESS(rv, rv);
if (item) {
rv = WrapNative(cx, obj, item, vp);
rv = WrapNative(cx, obj, item, NS_GET_IID(nsISupports), vp);
NS_ENSURE_SUCCESS(rv, rv);
rv = NS_SUCCESS_I_DID_SOMETHING;
@ -7962,7 +7966,8 @@ nsContentListSH::PreCreate(nsISupports *nativeObj, JSContext *cx,
jsval v;
nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
nsresult rv = WrapNative(cx, globalObj, native_parent, &v,
nsresult rv = WrapNative(cx, globalObj, native_parent,
NS_GET_IID(nsISupports), &v,
getter_AddRefs(holder));
*parentObj = JSVAL_TO_OBJECT(v);
@ -8078,7 +8083,7 @@ nsDocumentSH::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
jsval v;
nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
rv = WrapNative(cx, obj, location, &NS_GET_IID(nsIDOMLocation), &v,
rv = WrapNative(cx, obj, location, NS_GET_IID(nsIDOMLocation), &v,
getter_AddRefs(holder));
NS_ENSURE_SUCCESS(rv, rv);
@ -8122,7 +8127,7 @@ nsDocumentSH::GetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
NS_ENSURE_TRUE(uri, NS_ERROR_NOT_AVAILABLE);
nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
nsresult rv = WrapNative(cx, obj, uri, &NS_GET_IID(nsIURI), vp,
nsresult rv = WrapNative(cx, obj, uri, NS_GET_IID(nsIURI), vp,
getter_AddRefs(holder));
return NS_FAILED(rv) ? rv : NS_SUCCESS_I_DID_SOMETHING;
@ -8154,7 +8159,7 @@ nsDocumentSH::SetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
rv = WrapNative(cx, obj, location, &NS_GET_IID(nsIDOMLocation), vp,
rv = WrapNative(cx, obj, location, NS_GET_IID(nsIDOMLocation), vp,
getter_AddRefs(holder));
return NS_FAILED(rv) ? rv : NS_SUCCESS_I_DID_SOMETHING;
}
@ -8212,7 +8217,7 @@ nsDocumentSH::PostCreate(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
jsval winVal;
nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
rv = WrapNative(cx, obj, win, &NS_GET_IID(nsIDOMWindow), &winVal,
rv = WrapNative(cx, obj, win, NS_GET_IID(nsIDOMWindow), &winVal,
getter_AddRefs(holder));
NS_ENSURE_SUCCESS(rv, rv);
@ -8331,7 +8336,7 @@ nsHTMLDocumentSH::DocumentOpen(JSContext *cx, JSObject *obj, uintN argc,
}
nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
rv = WrapNative(cx, obj, retval, &NS_GET_IID(nsIDOMDocument), rval,
rv = WrapNative(cx, obj, retval, NS_GET_IID(nsIDOMDocument), rval,
getter_AddRefs(holder));
NS_ASSERTION(NS_SUCCEEDED(rv), "Failed to wrap native!");
@ -8406,7 +8411,8 @@ nsHTMLDocumentSH::GetDocumentAllNodeList(JSContext *cx, JSObject *obj,
rv |= domdoc->GetElementsByTagName(NS_LITERAL_STRING("*"), nodeList);
nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
rv |= nsDOMClassInfo::WrapNative(cx, obj, *nodeList, &collection,
rv |= nsDOMClassInfo::WrapNative(cx, obj, *nodeList,
NS_GET_IID(nsISupports), &collection,
getter_AddRefs(holder));
// ... and store it in our reserved slot.
@ -8493,7 +8499,7 @@ nsHTMLDocumentSH::DocumentAllGetProperty(JSContext *cx, JSObject *obj,
}
if (result) {
rv = WrapNative(cx, obj, result, vp);
rv = WrapNative(cx, obj, result, NS_GET_IID(nsISupports), vp);
if (NS_FAILED(rv)) {
nsDOMClassInfo::ThrowJSException(cx, rv);
@ -8765,7 +8771,8 @@ nsHTMLDocumentSH::DocumentAllTagsNewResolve(JSContext *cx, JSObject *obj,
if (tags) {
jsval v;
nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
nsresult rv = nsDOMClassInfo::WrapNative(cx, obj, tags, &v,
nsresult rv = nsDOMClassInfo::WrapNative(cx, obj, tags,
NS_GET_IID(nsISupports), &v,
getter_AddRefs(holder));
if (NS_FAILED(rv)) {
nsDOMClassInfo::ThrowJSException(cx, rv);
@ -8924,7 +8931,7 @@ nsHTMLDocumentSH::GetProperty(nsIXPConnectWrappedNative *wrapper,
NS_ENSURE_SUCCESS(rv, rv);
if (result) {
rv = WrapNative(cx, obj, result, vp);
rv = WrapNative(cx, obj, result, NS_GET_IID(nsISupports), vp);
if (NS_SUCCEEDED(rv)) {
rv = NS_SUCCESS_I_DID_SOMETHING;
}
@ -9064,7 +9071,7 @@ nsHTMLFormElementSH::GetProperty(nsIXPConnectWrappedNative *wrapper,
if (result) {
// Wrap result, result can be either an element or a list of
// elements
nsresult rv = WrapNative(cx, obj, result, vp);
nsresult rv = WrapNative(cx, obj, result, NS_GET_IID(nsISupports), vp);
return NS_FAILED(rv) ? rv : NS_SUCCESS_I_DID_SOMETHING;
}
}
@ -9076,7 +9083,7 @@ nsHTMLFormElementSH::GetProperty(nsIXPConnectWrappedNative *wrapper,
form->GetElementAt(n, getter_AddRefs(control));
if (control) {
nsresult rv = WrapNative(cx, obj, control, vp);
nsresult rv = WrapNative(cx, obj, control, NS_GET_IID(nsISupports), vp);
return NS_FAILED(rv) ? rv : NS_SUCCESS_I_DID_SOMETHING;
}
}
@ -9183,7 +9190,7 @@ nsHTMLSelectElementSH::GetProperty(nsIXPConnectWrappedNative *wrapper,
options->Item(n, getter_AddRefs(node));
rv = WrapNative(cx, obj, node, &NS_GET_IID(nsIDOMNode), vp);
rv = WrapNative(cx, obj, node, NS_GET_IID(nsIDOMNode), vp);
if (NS_SUCCEEDED(rv)) {
rv = NS_SUCCESS_I_DID_SOMETHING;
}

13
dom/src/base/nsDOMClassInfo.h
View File

@ -130,22 +130,11 @@ public:
}
static nsresult WrapNative(JSContext *cx, JSObject *scope,
nsISupports *native, const nsIID* aIID,
nsISupports *native, const nsIID& aIID,
jsval *vp,
// If non-null aHolder will keep the jsval alive
// while there's a ref to it
nsIXPConnectJSObjectHolder** aHolder = nsnull);
// Same as the WrapNative above, but use this one if aIID is nsISupports' IID.
static nsresult WrapNative(JSContext *cx, JSObject *scope,
nsISupports *native, jsval *vp,
// If non-null aHolder will keep the jsval alive
// while there's a ref to it
nsIXPConnectJSObjectHolder** aHolder = nsnull)
{
return WrapNative(cx, scope, native, nsnull, vp, aHolder);
}
static nsresult ThrowJSException(JSContext *cx, nsresult aResult);
static nsresult InitDOMJSClass(JSContext *cx, JSObject *obj);

6
js/src/xpconnect/idl/nsIXPConnect.idl
View File

@ -471,16 +471,12 @@ interface nsIXPConnect : nsISupports
* Same as wrapNative, but also returns the JSObject in aVal. C++ callers
* can pass in null for the aHolder argument, but in that case they must
* ensure that aVal is rooted.
* aIID may be null, it means the same as passing in
* &NS_GET_IID(nsISupports) but when passing in null certain shortcuts
* can be taken because we know without comparing IIDs that the caller is
* asking for an nsISupports wrapper.
*/
void
wrapNativeToJSVal(in JSContextPtr aJSContext,
in JSObjectPtr aScope,
in nsISupports aCOMObj,
in nsIIDPtr aIID,
in nsIIDRef aIID,
out JSVal aVal,
out nsIXPConnectJSObjectHolder aHolder);

15
js/src/xpconnect/src/nsXPConnect.cpp
View File

@ -1114,9 +1114,8 @@ nsXPConnect::InitClassesWithNewWrappedGlobal(JSContext * aJSContext,
nsresult rv;
if(!XPCConvert::NativeInterface2JSObject(ccx, &v,
getter_AddRefs(holder),
aCOMObj, &aIID, nsnull,
tempGlobal, PR_FALSE,
OBJ_IS_GLOBAL, &rv))
aCOMObj, &aIID, tempGlobal,
PR_FALSE, OBJ_IS_GLOBAL, &rv))
return UnexpectedFailure(rv);
NS_ASSERTION(NS_SUCCEEDED(rv) && holder, "Didn't wrap properly");
@ -1188,15 +1187,15 @@ nsXPConnect::WrapNative(JSContext * aJSContext,
NS_ASSERTION(aHolder, "bad param");
jsval v;
return WrapNativeToJSVal(aJSContext, aScope, aCOMObj, &aIID, &v, aHolder);
return WrapNativeToJSVal(aJSContext, aScope, aCOMObj, aIID, &v, aHolder);
}
/* void wrapNativeToJSVal (in JSContextPtr aJSContext, in JSObjectPtr aScope, in nsISupports aCOMObj, in nsIIDPtr aIID, out JSVal aVal, out nsIXPConnectJSObjectHolder aHolder); */
/* void wrapNativeToJSVal (in JSContextPtr aJSContext, in JSObjectPtr aScope, in nsISupports aCOMObj, in nsIIDRef aIID, out JSVal aVal, out nsIXPConnectJSObjectHolder aHolder); */
NS_IMETHODIMP
nsXPConnect::WrapNativeToJSVal(JSContext * aJSContext,
JSObject * aScope,
nsISupports *aCOMObj,
const nsIID * aIID,
const nsIID & aIID,
jsval *aVal,
nsIXPConnectJSObjectHolder **aHolder)
{
@ -1212,8 +1211,8 @@ nsXPConnect::WrapNativeToJSVal(JSContext * aJSContext,
return UnexpectedFailure(NS_ERROR_FAILURE);
nsresult rv;
if(!XPCConvert::NativeInterface2JSObject(ccx, aVal, aHolder, aCOMObj, aIID,
nsnull, aScope, PR_FALSE,
if(!XPCConvert::NativeInterface2JSObject(ccx, aVal, aHolder, aCOMObj, &aIID,
aScope, PR_FALSE,
OBJ_IS_NOT_GLOBAL, &rv))
return rv;

54
js/src/xpconnect/src/qsgen.py
View File

@ -330,12 +330,10 @@ def writeHeaderFile(filename, name):
try:
f.write("/* THIS FILE IS AUTOGENERATED - DO NOT EDIT */\n"
"#ifndef " + headerMacro + "\n"
"#define " + headerMacro + "\n\n"
"#define " + headerMacro + "\n"
"JSBool " + name + "_DefineQuickStubs("
"JSContext *cx, JSObject *proto, uintN flags, "
"PRUint32 count, const nsID **iids);\n\n"
"void " + name + "_MarkInterfaces();\n\n"
"void " + name + "_ClearInterfaces();\n\n"
"PRUint32 count, const nsID **iids);\n"
"#endif\n")
finally:
f.close()
@ -600,10 +598,8 @@ def writeResultConv(f, type, paramNum, jsvalPtr, jsvalRef):
% (paramNum, jsvalPtr))
return
else:
f.write(" AutoMarkingNativeInterfacePtr resultiface(ccx, "
"%s_Interface(ccx));\n" % type.name)
f.write(" return xpc_qsXPCOMObjectToJsval(ccx, result, "
"resultiface, %s);\n" % jsvalPtr)
"NS_GET_IID(%s), %s);\n" % (type.name, jsvalPtr))
return
warn("Unable to convert result of type %s" % type.name)
@ -823,32 +819,6 @@ def hashIID(iid):
uuid_re = re.compile(r'^([0-9a-f]{8})-([0-9a-f]{4})-([0-9a-f]{4})-([0-9a-f]{4})-([0-9a-f]{12})$')
def writeResultXPCInterfacesArray(f, conf, resulttypes):
f.write("// === XPCNativeInterface cache \n\n")
count = len(resulttypes)
if count > 0:
f.write("static XPCNativeInterface* interfaces[%d];\n\n" % count)
f.write("void %s_MarkInterfaces()\n"
"{\n" % conf.name)
if count > 0:
f.write(" for (PRUint32 i = 0; i < %d; ++i)\n"
" if (interfaces[i])\n"
" interfaces[i]->Mark();\n" % count)
f.write("}\n")
f.write("void %s_ClearInterfaces()\n"
"{\n" % conf.name)
if count > 0:
f.write(" memset(interfaces, 0, %d * "
"sizeof(XPCNativeInterface*));\n" % count)
f.write("}\n\n")
i = 0
for type in resulttypes:
f.write("XPC_QS_DEFINE_XPCNATIVEINTERFACE_GETTER(%s, interfaces[%d])\n"
% (type, i))
i += 1
if count > 0:
f.write("\n\n")
def writeDefiner(f, conf, interfaces):
f.write("// === Definer\n\n")
@ -967,41 +937,31 @@ def writeStubFile(filename, headerFilename, conf, interfaces):
def includeType(type):
type = unaliasType(type)
if type.kind in ('builtin', 'native'):
return None
return
file = conf.irregularFilenames.get(type.name, type.name) + '.h'
if file not in filesIncluded:
f.write('#include "%s"\n' % file)
filesIncluded.add(file)
return type
def writeIncludesForMember(member):
assert member.kind in ('attribute', 'method')
resulttype = includeType(member.realtype)
includeType(member.realtype)
if member.kind == 'method':
for p in member.params:
includeType(p.realtype)
return resulttype
def writeIncludesForInterface(iface):
assert iface.kind == 'interface'
resulttypes = []
for member in iface.stubMembers:
resulttype = writeIncludesForMember(member)
if resulttype is not None and not isVariantType(resulttype):
resulttypes.append(resulttype.name)
writeIncludesForMember(member)
includeType(iface)
return resulttypes
try:
f.write(stubTopTemplate % os.path.basename(headerFilename))
N = 256
resulttypes = []
for iface in interfaces:
resulttypes.extend(writeIncludesForInterface(iface))
writeIncludesForInterface(iface)
f.write("\n\n")
writeResultXPCInterfacesArray(f, conf, frozenset(resulttypes))
for iface in interfaces:
writeStubsForInterface(f, iface)
writeDefiner(f, conf, interfaces)

24
js/src/xpconnect/src/xpcconvert.cpp
View File

@ -1054,12 +1054,12 @@ XPCConvert::NativeInterface2JSObject(XPCCallContext& ccx,
nsIXPConnectJSObjectHolder** dest,
nsISupports* src,
const nsID* iid,
XPCNativeInterface* interface,
JSObject* scope,
PRBool allowNativeWrapper,
PRBool isGlobal,
nsresult* pErr)
{
NS_ASSERTION(iid, "bad param");
NS_ASSERTION(scope, "bad param");
*d = JSVAL_NULL;
@ -1090,13 +1090,7 @@ XPCConvert::NativeInterface2JSObject(XPCCallContext& ccx,
// verify that this wrapper is for the right interface
nsCOMPtr<nsISupports> wrapper;
if(interface)
src->QueryInterface(*interface->GetIID(),
(void**)getter_AddRefs(wrapper));
else if(iid)
src->QueryInterface(*iid, (void**)getter_AddRefs(wrapper));
else
wrapper = do_QueryInterface(src);
src->QueryInterface(*iid, (void**)getter_AddRefs(wrapper));
nsCOMPtr<nsIXPConnectJSObjectHolder> holder =
do_QueryInterface(wrapper);
JSObject* flat;
@ -1116,13 +1110,10 @@ XPCConvert::NativeInterface2JSObject(XPCCallContext& ccx,
if(!xpcscope)
return JS_FALSE;
AutoMarkingNativeInterfacePtr iface(ccx, interface);
if(!iface && iid)
{
iface = XPCNativeInterface::GetNewOrUsed(ccx, iid);
if(!iface)
return JS_FALSE;
}
AutoMarkingNativeInterfacePtr iface(ccx);
iface = XPCNativeInterface::GetNewOrUsed(ccx, iid);
if(!iface)
return JS_FALSE;
nsresult rv;
XPCWrappedNative* wrapper;
@ -1137,8 +1128,7 @@ XPCConvert::NativeInterface2JSObject(XPCCallContext& ccx,
// rooted in that case).
if(dest)
strongWrapper = wrapper;
if(iface)
wrapper->FindTearOff(ccx, iface, JS_FALSE, &rv);
wrapper->FindTearOff(ccx, iface, JS_FALSE, &rv);
}
else
{

5
js/src/xpconnect/src/xpcjsruntime.cpp
View File

@ -41,7 +41,6 @@
/* Per JSRuntime object */
#include "xpcprivate.h"
#include "dom_quickstubs.h"
/***************************************************************************/
@ -606,8 +605,6 @@ JSBool XPCJSRuntime::GCCallback(JSContext *cx, JSGCStatus status)
self->mDetachedWrappedNativeProtoMap->
Enumerate(DetachedWrappedNativeProtoMarker, nsnull);
DOM_MarkInterfaces();
// Mark the sets used in the call contexts. There is a small
// chance that a wrapper's set will change *while* a call is
// happening which uses that wrapper's old interfface set. So,
@ -1003,8 +1000,6 @@ XPCJSRuntime::~XPCJSRuntime()
XPCConvert::RemoveXPCOMUCStringFinalizer();
DOM_ClearInterfaces();
if(mJSHolders.ops)
{
JS_DHashTableFinish(&mJSHolders);

7
js/src/xpconnect/src/xpcprivate.h
View File

@ -2765,7 +2765,6 @@ public:
nsIXPConnectJSObjectHolder** dest,
nsISupports* src,
const nsID* iid,
XPCNativeInterface* interface,
JSObject* scope,
PRBool allowNativeWrapper,
PRBool isGlobal,
@ -2780,9 +2779,9 @@ public:
nsresult* pErr)
{
jsval v;
JSBool ok = NativeInterface2JSObject(ccx, &v, nsnull, src, iid, nsnull,
scope, allowNativeWrapper,
isGlobal, pErr);
JSBool ok = NativeInterface2JSObject(ccx, &v, nsnull, src, iid, scope,
allowNativeWrapper, isGlobal,
pErr);
*dest = JSVAL_TO_OBJECT(v);
return ok;
}

10
js/src/xpconnect/src/xpcquickstubs.cpp
View File

@ -743,7 +743,7 @@ xpc_qsStringToJsval(JSContext *cx, const nsAString &str, jsval *rval)
JSBool
xpc_qsXPCOMObjectToJsval(XPCCallContext &ccx, nsISupports *p,
XPCNativeInterface *interface, jsval *rval)
const nsIID &iid, jsval *rval)
{
// From the T_INTERFACE case in XPCConvert::NativeData2JS.
// This is one of the slowest things quick stubs do.
@ -751,18 +751,14 @@ xpc_qsXPCOMObjectToJsval(XPCCallContext &ccx, nsISupports *p,
JSObject *scope = ccx.GetCurrentJSObject();
NS_ASSERTION(scope, "bad ccx");
if(!interface)
return xpc_qsThrow(ccx, NS_ERROR_XPC_BAD_CONVERT_NATIVE);
// XXX The OBJ_IS_NOT_GLOBAL here is not really right. In
// fact, this code is depending on the fact that the
// global object will not have been collected, and
// therefore this NativeInterface2JSObject will not end up
// creating a new XPCNativeScriptableShared.
nsresult rv;
if(!XPCConvert::NativeInterface2JSObject(ccx, rval, nsnull, p, nsnull,
interface, scope, PR_TRUE,
OBJ_IS_NOT_GLOBAL, &rv))
if(!XPCConvert::NativeInterface2JSObject(ccx, rval, nsnull, p, &iid, scope,
PR_TRUE, OBJ_IS_NOT_GLOBAL, &rv))
{
// I can't tell if NativeInterface2JSObject throws JS exceptions
// or not. This is a sloppy stab at the right semantics; the

12
js/src/xpconnect/src/xpcquickstubs.h
View File

@ -398,7 +398,7 @@ xpc_qsUnwrapArg(JSContext *cx, jsval v, T **ppArg)
JSBool
xpc_qsXPCOMObjectToJsval(XPCCallContext &ccx,
nsISupports *p,
XPCNativeInterface *interface,
const nsIID &iid,
jsval *rval);
/**
@ -432,14 +432,4 @@ xpc_qsAssertContextOK(JSContext *cx);
#define XPC_QS_ASSERT_CONTEXT_OK(cx) ((void) 0)
#endif
#define XPC_QS_DEFINE_XPCNATIVEINTERFACE_GETTER(_iface, _iface_cache) \
inline XPCNativeInterface* \
_iface##_Interface(XPCCallContext& ccx) \
{ \
if(!(_iface_cache)) \
(_iface_cache) = \
XPCNativeInterface::GetNewOrUsed(ccx, &NS_GET_IID(_iface)); \
return (_iface_cache); \
}
#endif /* xpcquickstubs_h___ */

11
js/src/xpconnect/src/xpcwrappednative.cpp
View File

@ -333,7 +333,7 @@ XPCWrappedNative::GetNewOrUsed(XPCCallContext& ccx,
if(wrapper)
{
if(Interface && !wrapper->FindTearOff(ccx, Interface, JS_FALSE, &rv))
if(!wrapper->FindTearOff(ccx, Interface, JS_FALSE, &rv))
{
NS_RELEASE(wrapper);
NS_ASSERTION(NS_FAILED(rv), "returning NS_OK on failure");
@ -356,8 +356,7 @@ XPCWrappedNative::GetNewOrUsed(XPCCallContext& ccx,
// If we are making a wrapper for the nsIClassInfo interface then
// We *don't* want to have it use the prototype meant for instances
// of that class.
JSBool isClassInfo = Interface &&
Interface->GetIID()->Equals(NS_GET_IID(nsIClassInfo));
JSBool isClassInfo = Interface->GetIID()->Equals(NS_GET_IID(nsIClassInfo));
nsCOMPtr<nsIClassInfo> info;
@ -430,7 +429,7 @@ XPCWrappedNative::GetNewOrUsed(XPCCallContext& ccx,
if(wrapper)
{
if(Interface && !wrapper->FindTearOff(ccx, Interface, JS_FALSE, &rv))
if(!wrapper->FindTearOff(ccx, Interface, JS_FALSE, &rv))
{
NS_RELEASE(wrapper);
NS_ASSERTION(NS_FAILED(rv), "returning NS_OK on failure");
@ -489,7 +488,7 @@ XPCWrappedNative::GetNewOrUsed(XPCCallContext& ccx,
return NS_ERROR_FAILURE;
}
if(Interface && !wrapper->FindTearOff(ccx, Interface, JS_FALSE, &rv))
if(!wrapper->FindTearOff(ccx, Interface, JS_FALSE, &rv))
{
// Second reference will be released by the FlatJSObject's finializer.
wrapper->Release();
@ -637,7 +636,7 @@ XPCWrappedNative::GetUsedOnly(XPCCallContext& ccx,
}
nsresult rv;
if(Interface && !wrapper->FindTearOff(ccx, Interface, JS_FALSE, &rv))
if(!wrapper->FindTearOff(ccx, Interface, JS_FALSE, &rv))
{
NS_RELEASE(wrapper);
NS_ASSERTION(NS_FAILED(rv), "returning NS_OK on failure");