wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 422025 - [p=jst@mozilla.org (Johnny Stenback [jst]) r+sr=mrbkap a1.9b5=schrep]

Browse Source
This commit is contained in:
reed@reedloden.com 2008-03-25 16:16:21 -07:00
parent 755c32e75f
commit 7931af4544
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/xpconnect/src/XPCWrapper.cpp
View File

@ -215,7 +215,7 @@ XPCWrapper::AddProperty(JSContext *cx, JSObject *wrapperObj,
attrs = sprop->attrs;
if (attrs & JSPROP_GETTER) {
getter = sprop->getter;
getter = sprop->getter;
}
if (attrs & JSPROP_SETTER) {
setter = sprop->setter;

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

@ -1219,6 +1219,24 @@ XPCConvert::NativeInterface2JSObject(XPCCallContext& ccx,
*dest = objHolder;
return JS_TRUE;
}
// Reaching across scopes from content code. Wrap
// the new object in a XOW.
jsval v = OBJECT_TO_JSVAL(flat);
XPCJSObjectHolder *objHolder = nsnull;
if (!XPC_XOW_WrapObject(ccx, scope, &v) ||
!(objHolder =
XPCJSObjectHolder::newHolder(ccx,
JSVAL_TO_OBJECT(v))))
{
NS_RELEASE(wrapper);
return JS_FALSE;
}
NS_ADDREF(objHolder);
NS_RELEASE(wrapper);
*dest = objHolder;
return JS_TRUE;
}
}