Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1271653 - Move remaining helper functions and data for DebuggerObject into class;r=fitzgen

Browse Source
This commit is contained in:
Eddy Bruel 2016-06-29 14:03:03 +02:00
parent 6dcf0f1e6b
commit 29f5217893
2 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -134,7 +134,7 @@ enum {
JSSLOT_DEBUGOBJECT_COUNT
};
static const ClassOps DebuggerObject_classOps = {
const ClassOps DebuggerObject::classOps_ = {
nullptr, /* addProperty */
nullptr, /* delProperty */
nullptr, /* getProperty */
@ -153,7 +153,7 @@ const Class DebuggerObject::class_ = {
"Object",
JSCLASS_HAS_PRIVATE |
JSCLASS_HAS_RESERVED_SLOTS(RESERVED_SLOTS),
&DebuggerObject_classOps
&classOps_
};
enum {
@ -7807,8 +7807,8 @@ DebuggerObject_trace(JSTracer* trc, JSObject* obj)
}
}
static DebuggerObject*
DebuggerObject_checkThis(JSContext* cx, const CallArgs& args, const char* fnname)
/* static */ DebuggerObject*
DebuggerObject::checkThis(JSContext* cx, const CallArgs& args, const char* fnname)
{
JSObject* thisobj = NonNullObject(cx, args.thisv());
if (!thisobj)
@ -7833,27 +7833,27 @@ DebuggerObject_checkThis(JSContext* cx, const CallArgs& args, const char* fnname
return nthisobj;
}
#define THIS_DEBUGOBJECT(cx, argc, vp, fnname, args, object) \
CallArgs args = CallArgsFromVp(argc, vp); \
Rooted<DebuggerObject*> object(cx, DebuggerObject_checkThis(cx, args, fnname)); \
if (!object) \
return false; \
#define THIS_DEBUGOBJECT(cx, argc, vp, fnname, args, object) \
CallArgs args = CallArgsFromVp(argc, vp); \
Rooted<DebuggerObject*> object(cx, DebuggerObject::checkThis(cx, args, fnname)); \
if (!object) \
return false; \
#define THIS_DEBUGOBJECT_REFERENT(cx, argc, vp, fnname, args, obj) \
CallArgs args = CallArgsFromVp(argc, vp); \
RootedObject obj(cx, DebuggerObject_checkThis(cx, args, fnname)); \
if (!obj) \
return false; \
obj = (JSObject*) obj->as<NativeObject>().getPrivate(); \
#define THIS_DEBUGOBJECT_REFERENT(cx, argc, vp, fnname, args, obj) \
CallArgs args = CallArgsFromVp(argc, vp); \
RootedObject obj(cx, DebuggerObject::checkThis(cx, args, fnname)); \
if (!obj) \
return false; \
obj = (JSObject*) obj->as<NativeObject>().getPrivate(); \
MOZ_ASSERT(obj)
#define THIS_DEBUGOBJECT_OWNER_REFERENT(cx, argc, vp, fnname, args, dbg, obj) \
CallArgs args = CallArgsFromVp(argc, vp); \
RootedObject obj(cx, DebuggerObject_checkThis(cx, args, fnname)); \
if (!obj) \
return false; \
Debugger* dbg = Debugger::fromChildJSObject(obj); \
obj = (JSObject*) obj->as<NativeObject>().getPrivate(); \
#define THIS_DEBUGOBJECT_OWNER_REFERENT(cx, argc, vp, fnname, args, dbg, obj) \
CallArgs args = CallArgsFromVp(argc, vp); \
RootedObject obj(cx, DebuggerObject::checkThis(cx, args, fnname)); \
if (!obj) \
return false; \
Debugger* dbg = Debugger::fromChildJSObject(obj); \
obj = (JSObject*) obj->as<NativeObject>().getPrivate(); \
MOZ_ASSERT(obj)
#define THIS_DEBUGOBJECT_PROMISE(cx, argc, vp, fnname, args, obj) \
@ -7876,8 +7876,8 @@ DebuggerObject_checkThis(JSContext* cx, const CallArgs& args, const char* fnname
} \
Rooted<PromiseObject*> promise(cx, &obj->as<PromiseObject>());
static bool
DebuggerObject_construct(JSContext* cx, unsigned argc, Value* vp)
/* static */ bool
DebuggerObject::construct(JSContext* cx, unsigned argc, Value* vp)
{
JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_NO_CONSTRUCTOR,
"Debugger.Object");
@ -8798,7 +8798,7 @@ DebuggerObject::initClass(JSContext* cx, HandleObject obj, HandleObject debugCto
RootedObject objProto(cx, global->getOrCreateObjectPrototype(cx));
RootedNativeObject objectProto(cx, InitClass(cx, debugCtor, objProto, &class_,
DebuggerObject_construct, 0, properties_,
construct, 0, properties_,
methods_, nullptr, nullptr));
if (!objectProto)

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

@ -1205,8 +1205,6 @@ class DebuggerObject : public NativeObject
static MOZ_MUST_USE bool unwrap(JSContext* cx, Handle<DebuggerObject*> object,
MutableHandle<DebuggerObject*> result);
static MOZ_MUST_USE bool requireGlobal(JSContext* cx, Handle<DebuggerObject*> object);
private:
enum {
OWNER_SLOT
@ -1214,6 +1212,8 @@ class DebuggerObject : public NativeObject
static const unsigned RESERVED_SLOTS = 1;
static const ClassOps classOps_;
static const JSPropertySpec properties_[];
#ifdef SPIDERMONKEY_PROMISE
static const JSPropertySpec promiseProperties_[];
@ -1228,6 +1228,11 @@ class DebuggerObject : public NativeObject
Debugger* owner() const;
static DebuggerObject* checkThis(JSContext* cx, const CallArgs& args, const char* fnname);
static MOZ_MUST_USE bool requireGlobal(JSContext* cx, Handle<DebuggerObject*> object);
static MOZ_MUST_USE bool construct(JSContext* cx, unsigned argc, Value* vp);
static MOZ_MUST_USE bool callableGetter(JSContext* cx, unsigned argc, Value* vp);
static MOZ_MUST_USE bool isBoundFunctionGetter(JSContext* cx, unsigned argc, Value* vp);
static MOZ_MUST_USE bool isArrowFunctionGetter(JSContext* cx, unsigned argc, Value* vp);