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 754989 - Change cross-compartment wrapper map keying (r=bholley)

Browse Source
This commit is contained in:
Bill McCloskey 2012-05-22 14:54:50 -07:00
parent f841660ab2
commit 25432a4139
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
js/src/jscompartment.cpp
View File

@ -190,8 +190,10 @@ JSCompartment::wrap(JSContext *cx, Value *vp)
#endif
}
RootedVarValue key(cx, *vp);
/* If we already have a wrapper for this value, use it. */
if (WrapperMap::Ptr p = crossCompartmentWrappers.lookup(*vp)) {
if (WrapperMap::Ptr p = crossCompartmentWrappers.lookup(key)) {
*vp = p->value;
if (vp->isObject()) {
RootedVarObject obj(cx, &vp->toObject());
@ -250,7 +252,7 @@ JSCompartment::wrap(JSContext *cx, Value *vp)
if (wrapper->getProto() != proto && !SetProto(cx, wrapper, proto, false))
return false;
if (!crossCompartmentWrappers.put(GetProxyPrivate(wrapper), *vp))
if (!crossCompartmentWrappers.put(key, *vp))
return false;
if (!JSObject::setParent(cx, wrapper, global))
@ -353,9 +355,28 @@ JSCompartment::markCrossCompartmentWrappers(JSTracer *trc)
JS_ASSERT(!isCollecting());
for (WrapperMap::Enum e(crossCompartmentWrappers); !e.empty(); e.popFront()) {
Value tmp = e.front().key;
MarkValueRoot(trc, &tmp, "cross-compartment wrapper");
JS_ASSERT(tmp == e.front().key);
Value v = e.front().value;
if (v.isObject()) {
/*
* We have a cross-compartment wrapper. Its private pointer may
* point into the compartment being collected, so we should mark it.
*/
Value referent = GetProxyPrivate(&v.toObject());
MarkValueRoot(trc, &referent, "cross-compartment wrapper");
JS_ASSERT(referent == GetProxyPrivate(&v.toObject()));
} else {
/*
* Strings don't have a private pointer to mark, so we use the
* wrapper map key. (This does not work for wrappers because, in the
* case of Location objects, the wrapper map key is not the same as
* the proxy private slot. If we only marked the wrapper map key, we
* would miss same-compartment wrappers for Location objects.)
*/
JS_ASSERT(v.isString());
Value v = e.front().key;
MarkValueRoot(trc, &v, "cross-compartment wrapper");
JS_ASSERT(v == e.front().key);
}
}
}