Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 22:05:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1461292 part 2 - Rename JSAutoNullableCompartment to JSAutoNullableRealm. r=bz

Browse Source
This commit is contained in:
Jan de Mooij 2018-05-16 10:53:45 +02:00
parent 80e44e8003
commit 9cfbaa7e06
4 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dom/script/ScriptSettings.cpp
View File

@ -357,7 +357,7 @@ AutoJSAPI::InitInternal(nsIGlobalObject* aGlobalObject, JSObject* aGlobal,
if (aGlobal) {
JS::ExposeObjectToActiveJS(aGlobal);
}
mAutoNullableCompartment.emplace(mCx, aGlobal);
mAutoNullableRealm.emplace(mCx, aGlobal);
ScriptSettingsStack::Push(this);
@ -556,11 +556,10 @@ AutoJSAPI::ReportException()
return;
}
// AutoJSAPI uses a JSAutoNullableCompartment, and may be in a null
// compartment when the destructor is called. However, the JS engine
// requires us to be in a realm when we fetch the pending exception.
// In this case, we enter the privileged junk scope and don't dispatch any
// error events.
// AutoJSAPI uses a JSAutoNullableRealm, and may be in a null realm
// when the destructor is called. However, the JS engine requires us
// to be in a realm when we fetch the pending exception. In this case,
// we enter the privileged junk scope and don't dispatch any error events.
JS::Rooted<JSObject*> errorGlobal(cx(), JS::CurrentGlobalOrNull(cx()));
if (!errorGlobal) {
if (mIsMainThread) {

2
dom/script/ScriptSettings.h
View File

@ -294,7 +294,7 @@ protected:
AutoJSAPI(nsIGlobalObject* aGlobalObject, bool aIsMainThread, Type aType);
mozilla::Maybe<JSAutoRequest> mAutoRequest;
mozilla::Maybe<JSAutoNullableCompartment> mAutoNullableCompartment;
mozilla::Maybe<JSAutoNullableRealm> mAutoNullableRealm;
JSContext *mCx;
// Whether we're mainthread or not; set when we're initialized.

8
js/src/jsapi.cpp
View File

@ -718,9 +718,9 @@ JSAutoRealm::~JSAutoRealm()
cx_->leaveCompartment(oldCompartment_);
}
JSAutoNullableCompartment::JSAutoNullableCompartment(JSContext* cx,
JSObject* targetOrNull
MOZ_GUARD_OBJECT_NOTIFIER_PARAM_IN_IMPL)
JSAutoNullableRealm::JSAutoNullableRealm(JSContext* cx,
JSObject* targetOrNull
MOZ_GUARD_OBJECT_NOTIFIER_PARAM_IN_IMPL)
: cx_(cx),
oldCompartment_(cx->compartment())
{
@ -732,7 +732,7 @@ JSAutoNullableCompartment::JSAutoNullableCompartment(JSContext* cx,
cx_->enterNullCompartment();
}
JSAutoNullableCompartment::~JSAutoNullableCompartment()
JSAutoNullableRealm::~JSAutoNullableRealm()
{
cx_->leaveCompartment(oldCompartment_);
}

8
js/src/jsapi.h
View File

@ -1298,14 +1298,14 @@ class MOZ_RAII JS_PUBLIC_API(JSAutoRealm)
MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER
};
class MOZ_RAII JS_PUBLIC_API(JSAutoNullableCompartment)
class MOZ_RAII JS_PUBLIC_API(JSAutoNullableRealm)
{
JSContext* cx_;
JSCompartment* oldCompartment_;
public:
explicit JSAutoNullableCompartment(JSContext* cx, JSObject* targetOrNull
MOZ_GUARD_OBJECT_NOTIFIER_PARAM);
~JSAutoNullableCompartment();
explicit JSAutoNullableRealm(JSContext* cx, JSObject* targetOrNull
MOZ_GUARD_OBJECT_NOTIFIER_PARAM);
~JSAutoNullableRealm();
MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER
};