Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 07:15:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1271653 - Implement a C++ interface for deleteProperty;r=jimb

Browse Source
This commit is contained in:
Eddy Bruel 2016-05-23 08:21:48 +02:00
parent c98b51abce
commit 3e9a75c40f
2 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
js/src/vm/Debugger.cpp
View File

@ -8314,29 +8314,6 @@ DebuggerObject_defineProperties(JSContext* cx, unsigned argc, Value* vp)
return true;
}
/*
* This does a non-strict delete, as a matter of API design. The case where the
* property is non-configurable isn't necessarily exceptional here.
*/
static bool
DebuggerObject_deleteProperty(JSContext* cx, unsigned argc, Value* vp)
{
THIS_DEBUGOBJECT_REFERENT(cx, argc, vp, "deleteProperty", args, obj);
RootedId id(cx);
if (!ValueToId<CanGC>(cx, args.get(0), &id))
return false;
Maybe<AutoCompartment> ac;
ac.emplace(cx, obj);
ErrorCopier ec(ac);
ObjectOpResult result;
if (!DeleteProperty(cx, obj, id, result))
return false;
args.rval().setBoolean(result.ok());
return true;
}
static bool
DebuggerObject_isExtensible(JSContext* cx, unsigned argc, Value* vp)
{
@ -8510,6 +8487,27 @@ DebuggerObject_defineProperty(JSContext* cx, unsigned argc, Value* vp)
return true;
}
/*
* This does a non-strict delete, as a matter of API design. The case where the
* property is non-configurable isn't necessarily exceptional here.
*/
static bool
DebuggerObject_deleteProperty(JSContext* cx, unsigned argc, Value* vp)
{
THIS_DEBUGOBJECT(cx, argc, vp, "deleteProperty", object)
RootedId id(cx);
if (!ValueToId<CanGC>(cx, args.get(0), &id))
return false;
ObjectOpResult result;
if (!DebuggerObject::deleteProperty(cx, object, id, result))
return false;
args.rval().setBoolean(result.ok());
return true;
}
enum ApplyOrCallMode { ApplyMode, CallMode };
static bool
@ -8847,7 +8845,6 @@ const JSPropertySpec DebuggerObject::promiseProperties_[] = {
const JSFunctionSpec DebuggerObject::methods_[] = {
JS_FN("defineProperties", DebuggerObject_defineProperties, 1, 0),
JS_FN("deleteProperty", DebuggerObject_deleteProperty, 1, 0),
JS_FN("forceLexicalInitializationByName", DebuggerObject_forceLexicalInitializationByName, 1, 0),
JS_FN("isExtensible", DebuggerObject_isExtensible, 0, 0),
JS_FN("isSealed", DebuggerObject_isSealed, 0, 0),
@ -8859,6 +8856,7 @@ const JSFunctionSpec DebuggerObject::methods_[] = {
JS_FN("seal", DebuggerObject_seal, 0, 0),
JS_FN("freeze", DebuggerObject_freeze, 0, 0),
JS_FN("defineProperty", DebuggerObject_defineProperty, 2, 0),
JS_FN("deleteProperty", DebuggerObject_deleteProperty, 1, 0),
JS_FN("apply", DebuggerObject_apply, 0, 0),
JS_FN("call", DebuggerObject_call, 0, 0),
JS_FN("makeDebuggeeValue", DebuggerObject_makeDebuggeeValue, 1, 0),
@ -9063,6 +9061,18 @@ DebuggerObject::defineProperty(JSContext* cx, Handle<DebuggerObject*> object, Ha
return true;
}
/* static */ bool
DebuggerObject::deleteProperty(JSContext* cx, Handle<DebuggerObject*> object, HandleId id,
ObjectOpResult& result)
{
RootedObject referent(cx, object->referent());
Maybe<AutoCompartment> ac;
ac.emplace(cx, referent);
ErrorCopier ec(ac);
return DeleteProperty(cx, referent, id, result);
}
/*** Debugger.Environment ************************************************************************/

2
js/src/vm/Debugger.h
View File

@ -1051,6 +1051,8 @@ class DebuggerObject : public NativeObject
static bool freeze(JSContext* cx, Handle<DebuggerObject*> object);
static bool defineProperty(JSContext* cx, Handle<DebuggerObject*> object, HandleId id,
MutableHandle<PropertyDescriptor> desc);
static bool deleteProperty(JSContext* cx, Handle<DebuggerObject*> object, HandleId id,
ObjectOpResult& result);
private:
enum {