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

Bug 1595745 - Part 6: Change Math to use ClassSpec. r=mgaudet

Browse Source 
Similar to the JSON changes in part 5. Additionally 'FinishClassInitOp' is
needed to initialise the double constant properties.

Differential Revision: https://phabricator.services.mozilla.com/D52662

--HG--
extra : moz-landing-system : lando
This commit is contained in:
André Bargull 2019-11-15 17:42:34 +00:00
parent 0d959418d5
commit 09bd4eec3f
3 changed files with 20 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/public/ProtoKey.h
View File

@ -56,7 +56,7 @@
REAL(Boolean, InitViaClassSpec, OCLASP(Boolean)) \
REAL(JSON, InitViaClassSpec, CLASP(JSON)) \
REAL(Date, InitViaClassSpec, OCLASP(Date)) \
REAL(Math, InitMathClass, CLASP(Math)) \
REAL(Math, InitViaClassSpec, CLASP(Math)) \
REAL(Number, InitViaClassSpec, OCLASP(Number)) \
REAL(String, InitViaClassSpec, OCLASP(String)) \
REAL(RegExp, InitViaClassSpec, OCLASP(RegExp)) \

45
js/src/jsmath.cpp
View File

@ -95,9 +95,6 @@ static bool math_function(JSContext* cx, unsigned argc, Value* vp) {
return math_function<F>(cx, args[0], args.rval());
}
const JSClass js::MathClass = {js_Math_str,
JSCLASS_HAS_CACHED_PROTO(JSProto_Math)};
bool js::math_abs_handle(JSContext* cx, js::HandleValue v,
js::MutableHandleValue r) {
double x;
@ -937,31 +934,27 @@ static const JSFunctionSpec math_static_methods[] = {
JS_INLINABLE_FN("cbrt", math_cbrt, 1, 0, MathCbrt),
JS_FS_END};
JSObject* js::InitMathClass(JSContext* cx, Handle<GlobalObject*> global) {
static const JSPropertySpec math_static_properties[] = {
JS_STRING_SYM_PS(toStringTag, "Math", JSPROP_READONLY), JS_PS_END};
static JSObject* CreateMathObject(JSContext* cx, JSProtoKey key) {
Handle<GlobalObject*> global = cx->global();
RootedObject proto(cx, GlobalObject::getOrCreateObjectPrototype(cx, global));
if (!proto) {
return nullptr;
}
RootedObject Math(
cx, NewObjectWithGivenProto(cx, &MathClass, proto, SingletonObject));
if (!Math) {
return nullptr;
}
if (!JS_DefineProperty(cx, global, js_Math_str, Math, JSPROP_RESOLVING)) {
return nullptr;
}
if (!JS_DefineFunctions(cx, Math, math_static_methods)) {
return nullptr;
}
if (!JS_DefineConstDoubles(cx, Math, math_constants)) {
return nullptr;
}
if (!DefineToStringTag(cx, Math, cx->names().Math)) {
return nullptr;
}
global->setConstructor(JSProto_Math, ObjectValue(*Math));
return Math;
return NewObjectWithGivenProto(cx, &MathClass, proto, SingletonObject);
}
static bool MathClassFinish(JSContext* cx, HandleObject ctor,
HandleObject proto) {
return JS_DefineConstDoubles(cx, ctor, math_constants);
}
static const ClassSpec MathClassSpec = {
CreateMathObject, nullptr, math_static_methods, math_static_properties,
nullptr, nullptr, MathClassFinish};
const JSClass js::MathClass = {js_Math_str,
JSCLASS_HAS_CACHED_PROTO(JSProto_Math),
JS_NULL_CLASS_OPS, &MathClassSpec};

4
js/src/jsmath.h
View File

@ -15,8 +15,6 @@
namespace js {
class GlobalObject;
typedef double (*UnaryFunType)(double);
/*
@ -25,8 +23,6 @@ typedef double (*UnaryFunType)(double);
extern const JSClass MathClass;
extern JSObject* InitMathClass(JSContext* cx, Handle<GlobalObject*> global);
extern uint64_t GenerateRandomSeed();
// Fill |seed[0]| and |seed[1]| with random bits, suitable for