mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 860050 - Remove JSRawObject typedef; r=jonco 

--HG--
extra : rebase_source : 507e2dfe13d6a02317502cd7a4b2004c198d1bdf
This commit is contained in:
Terrence Cole 2013-04-15 18:16:13 -07:00
Родитель a240001cc0
Коммит 256e0a8901
10 изменённых файлов: 63 добавлений и 64 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
dom/network/src/TCPSocketChild.cpp
Просмотреть файл

@ -18,7 +18,7 @@ using mozilla::net::gNeckoChild;
namespace IPC { namespace IPC {
bool bool
DeserializeArrayBuffer(JSRawObject aObj, DeserializeArrayBuffer(JSObject* aObj,
const InfallibleTArray<uint8_t>& aBuffer, const InfallibleTArray<uint8_t>& aBuffer,
JS::Value* aVal) JS::Value* aVal)
{ {

2
dom/network/src/TCPSocketParent.cpp
Просмотреть файл

@ -14,7 +14,7 @@ namespace IPC {
//Defined in TCPSocketChild.cpp //Defined in TCPSocketChild.cpp
extern bool extern bool
DeserializeArrayBuffer(JSRawObject aObj, DeserializeArrayBuffer(JSObject* aObj,
const InfallibleTArray<uint8_t>& aBuffer, const InfallibleTArray<uint8_t>& aBuffer,
JS::Value* aVal); JS::Value* aVal);

2
js/src/ctypes/CTypes.cpp
Просмотреть файл

@ -1322,7 +1322,7 @@ JS_InitCTypesClass(JSContext* cx, JSObject *globalArg)
} }
JS_PUBLIC_API(void) JS_PUBLIC_API(void)
JS_SetCTypesCallbacks(JSRawObject ctypesObj, JSCTypesCallbacks* callbacks) JS_SetCTypesCallbacks(JSObject *ctypesObj, JSCTypesCallbacks* callbacks)
{ {
JS_ASSERT(callbacks); JS_ASSERT(callbacks);
JS_ASSERT(IsCTypesGlobal(ctypesObj)); JS_ASSERT(IsCTypesGlobal(ctypesObj));

4
js/src/ion/AsmJS.cpp
Просмотреть файл

@ -2282,7 +2282,7 @@ class FunctionCompiler
// subsequently owned by an AsmJSModuleClass JSObject. // subsequently owned by an AsmJSModuleClass JSObject.
static void AsmJSModuleObject_finalize(FreeOp *fop, RawObject obj); static void AsmJSModuleObject_finalize(FreeOp *fop, RawObject obj);
static void AsmJSModuleObject_trace(JSTracer *trc, JSRawObject obj); static void AsmJSModuleObject_trace(JSTracer *trc, JSObject *obj);
static const unsigned ASM_CODE_RESERVED_SLOT = 0; static const unsigned ASM_CODE_RESERVED_SLOT = 0;
static const unsigned ASM_CODE_NUM_RESERVED_SLOTS = 1; static const unsigned ASM_CODE_NUM_RESERVED_SLOTS = 1;
@ -2340,7 +2340,7 @@ AsmJSModuleObject_finalize(FreeOp *fop, RawObject obj)
} }
static void static void
AsmJSModuleObject_trace(JSTracer *trc, JSRawObject obj) AsmJSModuleObject_trace(JSTracer *trc, JSObject *obj)
{ {
AsmJSModuleObjectToModule(obj).trace(trc); AsmJSModuleObjectToModule(obj).trace(trc);
} }

34
js/src/jsapi.cpp
Просмотреть файл

@ -1474,7 +1474,7 @@ JS_SetWrapObjectCallbacks(JSRuntime *rt,
} }
JS_PUBLIC_API(JSCompartment *) JS_PUBLIC_API(JSCompartment *)
JS_EnterCompartment(JSContext *cx, JSRawObject target) JS_EnterCompartment(JSContext *cx, JSObject *target)
{ {
AssertHeapIsIdle(cx); AssertHeapIsIdle(cx);
CHECK_REQUEST(cx); CHECK_REQUEST(cx);
@ -1501,7 +1501,7 @@ JS_LeaveCompartment(JSContext *cx, JSCompartment *oldCompartment)
cx->leaveCompartment(oldCompartment); cx->leaveCompartment(oldCompartment);
} }
JSAutoCompartment::JSAutoCompartment(JSContext *cx, JSRawObject target) JSAutoCompartment::JSAutoCompartment(JSContext *cx, JSObject *target)
: cx_(cx), : cx_(cx),
oldCompartment_(cx->compartment) oldCompartment_(cx->compartment)
{ {
@ -1778,7 +1778,7 @@ JS_GetGlobalObject(JSContext *cx)
} }
JS_PUBLIC_API(void) JS_PUBLIC_API(void)
JS_SetGlobalObject(JSContext *cx, JSRawObject obj) JS_SetGlobalObject(JSContext *cx, JSObject *obj)
{ {
AssertHeapIsIdle(cx); AssertHeapIsIdle(cx);
CHECK_REQUEST(cx); CHECK_REQUEST(cx);
@ -2187,7 +2187,7 @@ JS_EnumerateResolvedStandardClasses(JSContext *cx, JSObject *objArg, JSIdArray *
#undef EAGER_ATOM_CLASP #undef EAGER_ATOM_CLASP
JS_PUBLIC_API(JSBool) JS_PUBLIC_API(JSBool)
JS_GetClassObject(JSContext *cx, JSRawObject obj, JSProtoKey key, JSObject **objpArg) JS_GetClassObject(JSContext *cx, JSObject *obj, JSProtoKey key, JSObject **objpArg)
{ {
RootedObject objp(cx, *objpArg); RootedObject objp(cx, *objpArg);
AssertHeapIsIdle(cx); AssertHeapIsIdle(cx);
@ -2223,7 +2223,7 @@ JS_IdentifyClassPrototype(JSContext *cx, JSObject *obj)
} }
JS_PUBLIC_API(JSObject *) JS_PUBLIC_API(JSObject *)
JS_GetObjectPrototype(JSContext *cx, JSRawObject forObj) JS_GetObjectPrototype(JSContext *cx, JSObject *forObj)
{ {
CHECK_REQUEST(cx); CHECK_REQUEST(cx);
assertSameCompartment(cx, forObj); assertSameCompartment(cx, forObj);
@ -2231,7 +2231,7 @@ JS_GetObjectPrototype(JSContext *cx, JSRawObject forObj)
} }
JS_PUBLIC_API(JSObject *) JS_PUBLIC_API(JSObject *)
JS_GetFunctionPrototype(JSContext *cx, JSRawObject forObj) JS_GetFunctionPrototype(JSContext *cx, JSObject *forObj)
{ {
CHECK_REQUEST(cx); CHECK_REQUEST(cx);
assertSameCompartment(cx, forObj); assertSameCompartment(cx, forObj);
@ -2239,7 +2239,7 @@ JS_GetFunctionPrototype(JSContext *cx, JSRawObject forObj)
} }
JS_PUBLIC_API(JSObject *) JS_PUBLIC_API(JSObject *)
JS_GetGlobalForObject(JSContext *cx, JSRawObject obj) JS_GetGlobalForObject(JSContext *cx, JSObject *obj)
{ {
AssertHeapIsIdle(cx); AssertHeapIsIdle(cx);
assertSameCompartment(cx, obj); assertSameCompartment(cx, obj);
@ -2247,7 +2247,7 @@ JS_GetGlobalForObject(JSContext *cx, JSRawObject obj)
} }
extern JS_PUBLIC_API(JSBool) extern JS_PUBLIC_API(JSBool)
JS_IsGlobalObject(JSRawObject obj) JS_IsGlobalObject(JSObject *obj)
{ {
return obj->isGlobal(); return obj->isGlobal();
} }
@ -3360,7 +3360,7 @@ JS_GetConstructor(JSContext *cx, JSObject *protoArg)
} }
JS_PUBLIC_API(JSBool) JS_PUBLIC_API(JSBool)
JS_GetObjectId(JSContext *cx, JSRawObject obj, jsid *idp) JS_GetObjectId(JSContext *cx, JSObject *obj, jsid *idp)
{ {
AssertHeapIsIdle(cx); AssertHeapIsIdle(cx);
assertSameCompartment(cx, obj); assertSameCompartment(cx, obj);
@ -3494,19 +3494,19 @@ JS_NewObjectForConstructor(JSContext *cx, JSClass *clasp, const jsval *vp)
} }
JS_PUBLIC_API(JSBool) JS_PUBLIC_API(JSBool)
JS_IsExtensible(JSRawObject obj) JS_IsExtensible(JSObject *obj)
{ {
return obj->isExtensible(); return obj->isExtensible();
} }
JS_PUBLIC_API(JSBool) JS_PUBLIC_API(JSBool)
JS_IsNative(JSRawObject obj) JS_IsNative(JSObject *obj)
{ {
return obj->isNative(); return obj->isNative();
} }
JS_PUBLIC_API(JSRuntime *) JS_PUBLIC_API(JSRuntime *)
JS_GetObjectRuntime(JSRawObject obj) JS_GetObjectRuntime(JSObject *obj)
{ {
return obj->compartment()->rt; return obj->compartment()->rt;
} }
@ -4867,7 +4867,7 @@ JS_NewFunctionById(JSContext *cx, JSNative native, unsigned nargs, unsigned flag
} }
JS_PUBLIC_API(JSObject *) JS_PUBLIC_API(JSObject *)
JS_CloneFunctionObject(JSContext *cx, JSObject *funobjArg, JSRawObject parentArg) JS_CloneFunctionObject(JSContext *cx, JSObject *funobjArg, JSObject *parentArg)
{ {
RootedObject funobj(cx, funobjArg); RootedObject funobj(cx, funobjArg);
RootedObject parent(cx, parentArg); RootedObject parent(cx, parentArg);
@ -4947,7 +4947,7 @@ JS_ObjectIsCallable(JSContext *cx, RawObject obj)
} }
JS_PUBLIC_API(JSBool) JS_PUBLIC_API(JSBool)
JS_IsNativeFunction(JSRawObject funobj, JSNative call) JS_IsNativeFunction(JSObject *funobj, JSNative call)
{ {
if (!funobj->isFunction()) if (!funobj->isFunction())
return false; return false;
@ -4962,7 +4962,7 @@ JS_IsConstructor(JSFunction *fun)
} }
JS_PUBLIC_API(JSObject*) JS_PUBLIC_API(JSObject*)
JS_BindCallable(JSContext *cx, JSObject *targetArg, JSRawObject newThis) JS_BindCallable(JSContext *cx, JSObject *targetArg, JSObject *newThis)
{ {
RootedObject target(cx, targetArg); RootedObject target(cx, targetArg);
RootedValue thisArg(cx, ObjectValue(*newThis)); RootedValue thisArg(cx, ObjectValue(*newThis));
@ -6716,7 +6716,7 @@ JS_NewDateObjectMsec(JSContext *cx, double msec)
} }
JS_PUBLIC_API(JSBool) JS_PUBLIC_API(JSBool)
JS_ObjectIsDate(JSContext *cx, JSRawObject objArg) JS_ObjectIsDate(JSContext *cx, JSObject *objArg)
{ {
RootedObject obj(cx, objArg); RootedObject obj(cx, objArg);
assertSameCompartment(cx, obj); assertSameCompartment(cx, obj);
@ -7208,7 +7208,7 @@ JS_EncodeScript(JSContext *cx, RawScript scriptArg, uint32_t *lengthp)
} }
JS_PUBLIC_API(void *) JS_PUBLIC_API(void *)
JS_EncodeInterpretedFunction(JSContext *cx, JSRawObject funobjArg, uint32_t *lengthp) JS_EncodeInterpretedFunction(JSContext *cx, JSObject *funobjArg, uint32_t *lengthp)
{ {
XDREncoder encoder(cx); XDREncoder encoder(cx);
RootedObject funobj(cx, funobjArg); RootedObject funobj(cx, funobjArg);

61
js/src/jsapi.h
Просмотреть файл

@ -810,7 +810,6 @@ typedef JS::MutableHandle<JSString*> JSMutableHandleString;
typedef JS::MutableHandle<JS::Value> JSMutableHandleValue; typedef JS::MutableHandle<JS::Value> JSMutableHandleValue;
typedef JS::MutableHandle<jsid> JSMutableHandleId; typedef JS::MutableHandle<jsid> JSMutableHandleId;
typedef js::RawObject JSRawObject;
typedef js::RawFunction JSRawFunction; typedef js::RawFunction JSRawFunction;
typedef js::RawScript JSRawScript; typedef js::RawScript JSRawScript;
typedef js::RawString JSRawString; typedef js::RawString JSRawString;
@ -1002,7 +1001,7 @@ typedef JSBool
* marking its native structures. * marking its native structures.
*/ */
typedef void typedef void
(* JSTraceOp)(JSTracer *trc, JSRawObject obj); (* JSTraceOp)(JSTracer *trc, JSObject *obj);
/* /*
* Callback that JSTraceOp implementation can provide to return a string * Callback that JSTraceOp implementation can provide to return a string
@ -1011,8 +1010,8 @@ typedef void
typedef void typedef void
(* JSTraceNamePrinter)(JSTracer *trc, char *buf, size_t bufsize); (* JSTraceNamePrinter)(JSTracer *trc, char *buf, size_t bufsize);
typedef JSRawObject typedef JSObject *
(* JSWeakmapKeyDelegateOp)(JSRawObject obj); (* JSWeakmapKeyDelegateOp)(JSObject *obj);
/* Callbacks and their arguments. */ /* Callbacks and their arguments. */
@ -1354,7 +1353,7 @@ JSID_TO_OBJECT(jsid id)
} }
static JS_ALWAYS_INLINE jsid static JS_ALWAYS_INLINE jsid
OBJECT_TO_JSID(JSRawObject obj) OBJECT_TO_JSID(JSObject *obj)
{ {
jsid id; jsid id;
JS_ASSERT(obj != NULL); JS_ASSERT(obj != NULL);
@ -2151,14 +2150,14 @@ class JS_PUBLIC_API(JSAutoCompartment)
JSContext *cx_; JSContext *cx_;
JSCompartment *oldCompartment_; JSCompartment *oldCompartment_;
public: public:
JSAutoCompartment(JSContext *cx, JSRawObject target); JSAutoCompartment(JSContext *cx, JSObject *target);
JSAutoCompartment(JSContext *cx, JSScript *target); JSAutoCompartment(JSContext *cx, JSScript *target);
~JSAutoCompartment(); ~JSAutoCompartment();
}; };
/* NB: This API is infallible; a NULL return value does not indicate error. */ /* NB: This API is infallible; a NULL return value does not indicate error. */
extern JS_PUBLIC_API(JSCompartment *) extern JS_PUBLIC_API(JSCompartment *)
JS_EnterCompartment(JSContext *cx, JSRawObject target); JS_EnterCompartment(JSContext *cx, JSObject *target);
extern JS_PUBLIC_API(void) extern JS_PUBLIC_API(void)
JS_LeaveCompartment(JSContext *cx, JSCompartment *oldCompartment); JS_LeaveCompartment(JSContext *cx, JSCompartment *oldCompartment);
@ -2178,7 +2177,7 @@ extern JS_PUBLIC_API(JSObject *)
JS_GetGlobalObject(JSContext *cx); JS_GetGlobalObject(JSContext *cx);
extern JS_PUBLIC_API(void) extern JS_PUBLIC_API(void)
JS_SetGlobalObject(JSContext *cx, JSRawObject obj); JS_SetGlobalObject(JSContext *cx, JSObject *obj);
/* /*
* Initialize standard JS class constructors, prototypes, and any top-level * Initialize standard JS class constructors, prototypes, and any top-level
@ -2220,7 +2219,7 @@ JS_EnumerateResolvedStandardClasses(JSContext *cx, JSObject *obj,
JSIdArray *ida); JSIdArray *ida);
extern JS_PUBLIC_API(JSBool) extern JS_PUBLIC_API(JSBool)
JS_GetClassObject(JSContext *cx, JSRawObject obj, JSProtoKey key, JSObject **objp); JS_GetClassObject(JSContext *cx, JSObject *obj, JSProtoKey key, JSObject **objp);
extern JS_PUBLIC_API(JSBool) extern JS_PUBLIC_API(JSBool)
JS_GetClassPrototype(JSContext *cx, JSProtoKey key, JSObject **objp); JS_GetClassPrototype(JSContext *cx, JSProtoKey key, JSObject **objp);
@ -2233,20 +2232,20 @@ JS_IdentifyClassPrototype(JSContext *cx, JSObject *obj);
* which |forObj| was created. * which |forObj| was created.
*/ */
extern JS_PUBLIC_API(JSObject *) extern JS_PUBLIC_API(JSObject *)
JS_GetFunctionPrototype(JSContext *cx, JSRawObject forObj); JS_GetFunctionPrototype(JSContext *cx, JSObject *forObj);
/* /*
* Returns the original value of |Object.prototype| from the global object in * Returns the original value of |Object.prototype| from the global object in
* which |forObj| was created. * which |forObj| was created.
*/ */
extern JS_PUBLIC_API(JSObject *) extern JS_PUBLIC_API(JSObject *)
JS_GetObjectPrototype(JSContext *cx, JSRawObject forObj); JS_GetObjectPrototype(JSContext *cx, JSObject *forObj);
extern JS_PUBLIC_API(JSObject *) extern JS_PUBLIC_API(JSObject *)
JS_GetGlobalForObject(JSContext *cx, JSRawObject obj); JS_GetGlobalForObject(JSContext *cx, JSObject *obj);
extern JS_PUBLIC_API(JSBool) extern JS_PUBLIC_API(JSBool)
JS_IsGlobalObject(JSRawObject obj); JS_IsGlobalObject(JSObject *obj);
/* /*
* May return NULL, if |c| never had a global (e.g. the atoms compartment), or * May return NULL, if |c| never had a global (e.g. the atoms compartment), or
@ -2310,7 +2309,7 @@ typedef struct JSCTypesCallbacks JSCTypesCallbacks;
* to call this function again. * to call this function again.
*/ */
extern JS_PUBLIC_API(void) extern JS_PUBLIC_API(void)
JS_SetCTypesCallbacks(JSRawObject ctypesObj, JSCTypesCallbacks *callbacks); JS_SetCTypesCallbacks(JSObject *ctypesObj, JSCTypesCallbacks *callbacks);
#endif #endif
typedef JSBool typedef JSBool
@ -3125,7 +3124,7 @@ extern JS_PUBLIC_API(JSBool)
JS_LinkConstructorAndPrototype(JSContext *cx, JSObject *ctor, JSObject *proto); JS_LinkConstructorAndPrototype(JSContext *cx, JSObject *ctor, JSObject *proto);
extern JS_PUBLIC_API(JSClass *) extern JS_PUBLIC_API(JSClass *)
JS_GetClass(JSRawObject obj); JS_GetClass(JSObject *obj);
extern JS_PUBLIC_API(JSBool) extern JS_PUBLIC_API(JSBool)
JS_InstanceOf(JSContext *cx, JSObject *obj, JSClass *clasp, jsval *argv); JS_InstanceOf(JSContext *cx, JSObject *obj, JSClass *clasp, jsval *argv);
@ -3134,10 +3133,10 @@ extern JS_PUBLIC_API(JSBool)
JS_HasInstance(JSContext *cx, JSObject *obj, jsval v, JSBool *bp); JS_HasInstance(JSContext *cx, JSObject *obj, jsval v, JSBool *bp);
extern JS_PUBLIC_API(void *) extern JS_PUBLIC_API(void *)
JS_GetPrivate(JSRawObject obj); JS_GetPrivate(JSObject *obj);
extern JS_PUBLIC_API(void) extern JS_PUBLIC_API(void)
JS_SetPrivate(JSRawObject obj, void *data); JS_SetPrivate(JSObject *obj, void *data);
extern JS_PUBLIC_API(void *) extern JS_PUBLIC_API(void *)
JS_GetInstancePrivate(JSContext *cx, JSObject *obj, JSClass *clasp, JS_GetInstancePrivate(JSContext *cx, JSObject *obj, JSClass *clasp,
@ -3150,7 +3149,7 @@ extern JS_PUBLIC_API(JSBool)
JS_SetPrototype(JSContext *cx, JSObject *obj, JSObject *proto); JS_SetPrototype(JSContext *cx, JSObject *obj, JSObject *proto);
extern JS_PUBLIC_API(JSObject *) extern JS_PUBLIC_API(JSObject *)
JS_GetParent(JSRawObject obj); JS_GetParent(JSObject *obj);
extern JS_PUBLIC_API(JSBool) extern JS_PUBLIC_API(JSBool)
JS_SetParent(JSContext *cx, JSObject *obj, JSObject *parent); JS_SetParent(JSContext *cx, JSObject *obj, JSObject *parent);
@ -3164,7 +3163,7 @@ JS_GetConstructor(JSContext *cx, JSObject *proto);
* and true with *idp containing the unique id on success. * and true with *idp containing the unique id on success.
*/ */
extern JS_PUBLIC_API(JSBool) extern JS_PUBLIC_API(JSBool)
JS_GetObjectId(JSContext *cx, JSRawObject obj, jsid *idp); JS_GetObjectId(JSContext *cx, JSObject *obj, jsid *idp);
namespace JS { namespace JS {
@ -3194,13 +3193,13 @@ JS_NewObject(JSContext *cx, JSClass *clasp, JSObject *proto, JSObject *parent);
/* Queries the [[Extensible]] property of the object. */ /* Queries the [[Extensible]] property of the object. */
extern JS_PUBLIC_API(JSBool) extern JS_PUBLIC_API(JSBool)
JS_IsExtensible(JSRawObject obj); JS_IsExtensible(JSObject *obj);
extern JS_PUBLIC_API(JSBool) extern JS_PUBLIC_API(JSBool)
JS_IsNative(JSRawObject obj); JS_IsNative(JSObject *obj);
extern JS_PUBLIC_API(JSRuntime *) extern JS_PUBLIC_API(JSRuntime *)
JS_GetObjectRuntime(JSRawObject obj); JS_GetObjectRuntime(JSObject *obj);
/* /*
* Unlike JS_NewObject, JS_NewObjectWithGivenProto does not compute a default * Unlike JS_NewObject, JS_NewObjectWithGivenProto does not compute a default
@ -3694,10 +3693,10 @@ JS_CheckAccess(JSContext *cx, JSObject *obj, jsid id, JSAccessMode mode,
jsval *vp, unsigned *attrsp); jsval *vp, unsigned *attrsp);
extern JS_PUBLIC_API(jsval) extern JS_PUBLIC_API(jsval)
JS_GetReservedSlot(JSRawObject obj, uint32_t index); JS_GetReservedSlot(JSObject *obj, uint32_t index);
extern JS_PUBLIC_API(void) extern JS_PUBLIC_API(void)
JS_SetReservedSlot(JSRawObject obj, uint32_t index, jsval v); JS_SetReservedSlot(JSObject *obj, uint32_t index, jsval v);
/************************************************************************/ /************************************************************************/
@ -3818,13 +3817,13 @@ JS_GetFunctionArity(JSFunction *fun);
* created instances using that constructor that might be passed in as obj). * created instances using that constructor that might be passed in as obj).
*/ */
extern JS_PUBLIC_API(JSBool) extern JS_PUBLIC_API(JSBool)
JS_ObjectIsFunction(JSContext *cx, JSRawObject obj); JS_ObjectIsFunction(JSContext *cx, JSObject *obj);
extern JS_PUBLIC_API(JSBool) extern JS_PUBLIC_API(JSBool)
JS_ObjectIsCallable(JSContext *cx, JSRawObject obj); JS_ObjectIsCallable(JSContext *cx, JSObject *obj);
extern JS_PUBLIC_API(JSBool) extern JS_PUBLIC_API(JSBool)
JS_IsNativeFunction(JSRawObject funobj, JSNative call); JS_IsNativeFunction(JSObject *funobj, JSNative call);
/* Return whether the given function is a valid constructor. */ /* Return whether the given function is a valid constructor. */
extern JS_PUBLIC_API(JSBool) extern JS_PUBLIC_API(JSBool)
@ -3836,7 +3835,7 @@ JS_IsConstructor(JSFunction *fun);
* If |callable| is not callable, will throw and return NULL. * If |callable| is not callable, will throw and return NULL.
*/ */
extern JS_PUBLIC_API(JSObject*) extern JS_PUBLIC_API(JSObject*)
JS_BindCallable(JSContext *cx, JSObject *callable, JSRawObject newThis); JS_BindCallable(JSContext *cx, JSObject *callable, JSObject *newThis);
extern JS_PUBLIC_API(JSBool) extern JS_PUBLIC_API(JSBool)
JS_DefineFunctions(JSContext *cx, JSObject *obj, const JSFunctionSpec *fs); JS_DefineFunctions(JSContext *cx, JSObject *obj, const JSFunctionSpec *fs);
@ -3859,7 +3858,7 @@ JS_DefineFunctionById(JSContext *cx, JSObject *obj, jsid id, JSNative call,
* fail if funobj was lexically nested inside some other function. * fail if funobj was lexically nested inside some other function.
*/ */
extern JS_PUBLIC_API(JSObject *) extern JS_PUBLIC_API(JSObject *)
JS_CloneFunctionObject(JSContext *cx, JSObject *funobj, JSRawObject parent); JS_CloneFunctionObject(JSContext *cx, JSObject *funobj, JSObject *parent);
/* /*
* Given a buffer, return JS_FALSE if the buffer might become a valid * Given a buffer, return JS_FALSE if the buffer might become a valid
@ -4824,7 +4823,7 @@ JS_NewDateObjectMsec(JSContext *cx, double msec);
* Infallible predicate to test whether obj is a date object. * Infallible predicate to test whether obj is a date object.
*/ */
extern JS_PUBLIC_API(JSBool) extern JS_PUBLIC_API(JSBool)
JS_ObjectIsDate(JSContext *cx, JSRawObject obj); JS_ObjectIsDate(JSContext *cx, JSObject *obj);
/* /*
* Clears the cache of calculated local time from each Date object. * Clears the cache of calculated local time from each Date object.
@ -5069,7 +5068,7 @@ extern JS_PUBLIC_API(void *)
JS_EncodeScript(JSContext *cx, JSScript *script, uint32_t *lengthp); JS_EncodeScript(JSContext *cx, JSScript *script, uint32_t *lengthp);
extern JS_PUBLIC_API(void *) extern JS_PUBLIC_API(void *)
JS_EncodeInterpretedFunction(JSContext *cx, JSRawObject funobj, uint32_t *lengthp); JS_EncodeInterpretedFunction(JSContext *cx, JSObject *funobj, uint32_t *lengthp);
extern JS_PUBLIC_API(JSScript *) extern JS_PUBLIC_API(JSScript *)
JS_DecodeScript(JSContext *cx, const void *data, uint32_t length, JS_DecodeScript(JSContext *cx, const void *data, uint32_t length,

12
js/src/jsdate.h
Просмотреть файл

@ -49,22 +49,22 @@ js_NewDateObject(JSContext* cx, int year, int mon, int mday,
int hour, int min, int sec); int hour, int min, int sec);
extern JS_FRIEND_API(int) extern JS_FRIEND_API(int)
js_DateGetYear(JSContext *cx, JSRawObject obj); js_DateGetYear(JSContext *cx, JSObject *obj);
extern JS_FRIEND_API(int) extern JS_FRIEND_API(int)
js_DateGetMonth(JSContext *cx, JSRawObject obj); js_DateGetMonth(JSContext *cx, JSObject *obj);
extern JS_FRIEND_API(int) extern JS_FRIEND_API(int)
js_DateGetDate(JSContext *cx, JSRawObject obj); js_DateGetDate(JSContext *cx, JSObject *obj);
extern JS_FRIEND_API(int) extern JS_FRIEND_API(int)
js_DateGetHours(JSContext *cx, JSRawObject obj); js_DateGetHours(JSContext *cx, JSObject *obj);
extern JS_FRIEND_API(int) extern JS_FRIEND_API(int)
js_DateGetMinutes(JSContext *cx, JSRawObject obj); js_DateGetMinutes(JSContext *cx, JSObject *obj);
extern JS_FRIEND_API(int) extern JS_FRIEND_API(int)
js_DateGetSeconds(JSRawObject obj); js_DateGetSeconds(JSObject *obj);
/* Date constructor native. Exposed only so the JIT can know its address. */ /* Date constructor native. Exposed only so the JIT can know its address. */
JSBool JSBool

6
js/src/jsfriendapi.h
Просмотреть файл

@ -36,10 +36,10 @@ extern JS_FRIEND_API(JSString *)
JS_GetAnonymousString(JSRuntime *rt); JS_GetAnonymousString(JSRuntime *rt);
extern JS_FRIEND_API(JSObject *) extern JS_FRIEND_API(JSObject *)
JS_FindCompilationScope(JSContext *cx, JSRawObject obj); JS_FindCompilationScope(JSContext *cx, JSObject *obj);
extern JS_FRIEND_API(JSFunction *) extern JS_FRIEND_API(JSFunction *)
JS_GetObjectFunction(JSRawObject obj); JS_GetObjectFunction(JSObject *obj);
extern JS_FRIEND_API(JSBool) extern JS_FRIEND_API(JSBool)
JS_SplicePrototype(JSContext *cx, JSObject *obj, JSObject *proto); JS_SplicePrototype(JSContext *cx, JSObject *obj, JSObject *proto);
@ -870,7 +870,7 @@ extern JS_FRIEND_API(JSBool)
js_DateIsValid(JSObject* obj); js_DateIsValid(JSObject* obj);
extern JS_FRIEND_API(double) extern JS_FRIEND_API(double)
js_DateGetMsecSinceEpoch(JSRawObject obj); js_DateGetMsecSinceEpoch(JSObject *obj);
/* Implemented in jscntxt.cpp. */ /* Implemented in jscntxt.cpp. */

2
js/src/perf/jsperf.cpp
Просмотреть файл

@ -225,7 +225,7 @@ GetPMFromThis(JSContext* cx, jsval* vp)
namespace JS { namespace JS {
JSObject* JSObject*
RegisterPerfMeasurement(JSContext *cx, JSRawObject global) RegisterPerfMeasurement(JSContext *cx, JSObject *global)
{ {
RootedObject prototype(cx); RootedObject prototype(cx);
prototype = JS_InitClass(cx, global, NULL /* parent */, prototype = JS_InitClass(cx, global, NULL /* parent */,

2
js/src/perf/jsperf.h
Просмотреть файл

@ -115,7 +115,7 @@ class JS_FRIEND_API(PerfMeasurement)
* global object). The JS-visible API is identical to the C++ API. * global object). The JS-visible API is identical to the C++ API.
*/ */
extern JS_FRIEND_API(JSObject*) extern JS_FRIEND_API(JSObject*)
RegisterPerfMeasurement(JSContext *cx, JSRawObject global); RegisterPerfMeasurement(JSContext *cx, JSObject *global);
/* /*
* Given a jsval which contains an instance of the aforementioned * Given a jsval which contains an instance of the aforementioned