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 887334 - Add a JSCompartment* to AutoCompartment and use it in JS_NewGlobalObject. r=luke

Browse Source 
This gets rid of the wonky setCompartment usage in that function.
This commit is contained in:
Bobby Holley 2013-07-17 11:53:52 -07:00
parent aee282ccae
commit c8c93ab150
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/src/jsapi.cpp
View File

@ -3318,10 +3318,12 @@ JS_NewGlobalObject(JSContext *cx, JSClass *clasp, JSPrincipals *principals,
AutoHoldZone hold(compartment->zone());
JSCompartment *saved = cx->compartment();
cx->setCompartment(compartment);
Rooted<GlobalObject *> global(cx, GlobalObject::create(cx, Valueify(clasp)));
cx->setCompartment(saved);
Rooted<GlobalObject *> global(cx);
{
AutoCompartment ac(cx, compartment);
global = GlobalObject::create(cx, Valueify(clasp));
}
if (!global)
return NULL;

1
js/src/jscompartment.h
View File

@ -460,6 +460,7 @@ class AutoCompartment
public:
inline AutoCompartment(JSContext *cx, JSObject *target);
inline AutoCompartment(JSContext *cx, JSCompartment *target);
inline ~AutoCompartment();
JSContext *context() const { return cx_; }

7
js/src/jscompartmentinlines.h
View File

@ -33,6 +33,13 @@ js::AutoCompartment::AutoCompartment(JSContext *cx, JSObject *target)
cx_->enterCompartment(target->compartment());
}
js::AutoCompartment::AutoCompartment(JSContext *cx, JSCompartment *target)
: cx_(cx),
origin_(cx->compartment())
{
cx_->enterCompartment(target);
}
js::AutoCompartment::~AutoCompartment()
{
cx_->leaveCompartment(origin_);