corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 959013 - Convert the Date object to use ClassSpec. r=luke

Browse Source
This commit is contained in:
Bobby Holley
2014-02-04 07:51:54 -08:00
parent eb43bbbb82
commit b9aa9facbf
3 changed files with 32 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
js/src/jsdate.cpp
View File

@@ -521,23 +521,6 @@ date_convert(JSContext *cx, HandleObject obj, JSType hint, MutableHandleValue vp
return DefaultValue(cx, obj, (hint == JSTYPE_VOID) ? JSTYPE_STRING : hint, vp);
}
/*
* Other Support routines and definitions
*/
const Class DateObject::class_ = {
js_Date_str,
JSCLASS_HAS_RESERVED_SLOTS(RESERVED_SLOTS) |
JSCLASS_HAS_CACHED_PROTO(JSProto_Date),
JS_PropertyStub, /* addProperty */
JS_DeletePropertyStub, /* delProperty */
JS_PropertyStub, /* getProperty */
JS_StrictPropertyStub, /* setProperty */
JS_EnumerateStub,
JS_ResolveStub,
date_convert
};
/* for use by date_parse */
static const char* const wtb[] = {
@@ -3027,52 +3010,48 @@ js_Date(JSContext *cx, unsigned argc, Value *vp)
return true;
}
JSObject *
js_InitDateClass(JSContext *cx, HandleObject obj)
static bool
FinishDateClassInit(JSContext *cx, HandleObject ctor, HandleObject proto)
{
JS_ASSERT(obj->isNative());
Rooted<GlobalObject*> global(cx, &obj->as<GlobalObject>());
RootedObject dateProto(cx, global->createBlankPrototype(cx, &DateObject::class_));
if (!dateProto)
return nullptr;
dateProto->as<DateObject>().setUTCTime(GenericNaN());
RootedFunction ctor(cx);
ctor = global->createConstructor(cx, js_Date, cx->names().Date, MAXARGS);
if (!ctor)
return nullptr;
if (!LinkConstructorAndPrototype(cx, ctor, dateProto))
return nullptr;
if (!DefinePropertiesAndBrand(cx, ctor, nullptr, date_static_methods))
return nullptr;
proto->as<DateObject>().setUTCTime(GenericNaN());
/*
* Define all Date.prototype.* functions, then brand for trace-jitted code.
* Date.prototype.toGMTString has the same initial value as
* Date.prototype.toUTCString.
*/
if (!JS_DefineFunctions(cx, dateProto, date_methods))
return nullptr;
RootedValue toUTCStringFun(cx);
RootedId toUTCStringId(cx, NameToId(cx->names().toUTCString));
RootedId toGMTStringId(cx, NameToId(cx->names().toGMTString));
if (!baseops::GetProperty(cx, dateProto, toUTCStringId, &toUTCStringFun) ||
!baseops::DefineGeneric(cx, dateProto, toGMTStringId, toUTCStringFun,
JS_PropertyStub, JS_StrictPropertyStub, 0))
{
return nullptr;
}
if (!DefineConstructorAndPrototype(cx, global, JSProto_Date, ctor, dateProto))
return nullptr;
return dateProto;
return baseops::GetProperty(cx, proto, toUTCStringId, &toUTCStringFun) &&
baseops::DefineGeneric(cx, proto, toGMTStringId, toUTCStringFun,
JS_PropertyStub, JS_StrictPropertyStub, 0);
}
const Class DateObject::class_ = {
js_Date_str,
JSCLASS_HAS_RESERVED_SLOTS(RESERVED_SLOTS) |
JSCLASS_HAS_CACHED_PROTO(JSProto_Date),
JS_PropertyStub, /* addProperty */
JS_DeletePropertyStub, /* delProperty */
JS_PropertyStub, /* getProperty */
JS_StrictPropertyStub, /* setProperty */
JS_EnumerateStub,
JS_ResolveStub,
date_convert,
nullptr, /* finalize */
nullptr, /* call */
nullptr, /* hasInstance */
nullptr, /* construct */
nullptr, /* trace */
{
GenericCreateConstructor<js_Date, NAME_OFFSET(Date), MAXARGS>,
GenericCreatePrototype<&DateObject::class_>,
date_static_methods,
date_methods,
FinishDateClassInit
}
};
JS_FRIEND_API(JSObject *)
js_NewDateObjectMsec(JSContext *cx, double msec_time)
{