wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 909171 (part 1) - Add JS_ prefixes to macros missing them in jsversion.h. r=luke.

Browse Source 
--HG--
extra : rebase_source : f8afce8bbed7a940e9168f4f851d18c5d30620e7
This commit is contained in:
Nicholas Nethercote 2013-08-26 17:09:27 -07:00
parent 12a52bc027
commit b297eab2c2
8 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/src/builtin/Object.cpp
View File

@ -341,7 +341,7 @@ obj_valueOf(JSContext *cx, unsigned argc, Value *vp)
return true; return true;
} }
#if OLD_GETTER_SETTER_METHODS #if JS_OLD_GETTER_SETTER_METHODS
enum DefineType { Getter, Setter }; enum DefineType { Getter, Setter };
@ -479,7 +479,7 @@ obj_lookupSetter(JSContext *cx, unsigned argc, Value *vp)
} }
return true; return true;
} }
#endif /* OLD_GETTER_SETTER_METHODS */ #endif /* JS_OLD_GETTER_SETTER_METHODS */
/* ES5 15.2.3.2. */ /* ES5 15.2.3.2. */
bool bool
@ -977,7 +977,7 @@ const JSFunctionSpec js::object_methods[] = {
JS_FN(js_hasOwnProperty_str, obj_hasOwnProperty, 1,0), JS_FN(js_hasOwnProperty_str, obj_hasOwnProperty, 1,0),
JS_FN(js_isPrototypeOf_str, obj_isPrototypeOf, 1,0), JS_FN(js_isPrototypeOf_str, obj_isPrototypeOf, 1,0),
JS_FN(js_propertyIsEnumerable_str, obj_propertyIsEnumerable, 1,0), JS_FN(js_propertyIsEnumerable_str, obj_propertyIsEnumerable, 1,0),
#if OLD_GETTER_SETTER_METHODS #if JS_OLD_GETTER_SETTER_METHODS
JS_FN(js_defineGetter_str, js::obj_defineGetter, 2,0), JS_FN(js_defineGetter_str, js::obj_defineGetter, 2,0),
JS_FN(js_defineSetter_str, js::obj_defineSetter, 2,0), JS_FN(js_defineSetter_str, js::obj_defineSetter, 2,0),
JS_FN(js_lookupGetter_str, obj_lookupGetter, 1,0), JS_FN(js_lookupGetter_str, obj_lookupGetter, 1,0),

2
js/src/jsapi.cpp
View File

@ -1480,7 +1480,7 @@ static const JSStdName object_prototype_names[] = {
{js_InitObjectClass, EAGER_ATOM(hasOwnProperty), &JSObject::class_}, {js_InitObjectClass, EAGER_ATOM(hasOwnProperty), &JSObject::class_},
{js_InitObjectClass, EAGER_ATOM(isPrototypeOf), &JSObject::class_}, {js_InitObjectClass, EAGER_ATOM(isPrototypeOf), &JSObject::class_},
{js_InitObjectClass, EAGER_ATOM(propertyIsEnumerable), &JSObject::class_}, {js_InitObjectClass, EAGER_ATOM(propertyIsEnumerable), &JSObject::class_},
#if OLD_GETTER_SETTER_METHODS #if JS_OLD_GETTER_SETTER_METHODS
{js_InitObjectClass, EAGER_ATOM(defineGetter), &JSObject::class_}, {js_InitObjectClass, EAGER_ATOM(defineGetter), &JSObject::class_},
{js_InitObjectClass, EAGER_ATOM(defineSetter), &JSObject::class_}, {js_InitObjectClass, EAGER_ATOM(defineSetter), &JSObject::class_},
{js_InitObjectClass, EAGER_ATOM(lookupGetter), &JSObject::class_}, {js_InitObjectClass, EAGER_ATOM(lookupGetter), &JSObject::class_},

2
js/src/jsfriendapi.h
View File

@ -240,7 +240,7 @@ typedef bool
extern JS_FRIEND_API(void) extern JS_FRIEND_API(void)
DumpHeapComplete(JSRuntime *rt, FILE *fp); DumpHeapComplete(JSRuntime *rt, FILE *fp);
#ifdef OLD_GETTER_SETTER_METHODS #ifdef JS_OLD_GETTER_SETTER_METHODS
JS_FRIEND_API(bool) obj_defineGetter(JSContext *cx, unsigned argc, js::Value *vp); JS_FRIEND_API(bool) obj_defineGetter(JSContext *cx, unsigned argc, js::Value *vp);
JS_FRIEND_API(bool) obj_defineSetter(JSContext *cx, unsigned argc, js::Value *vp); JS_FRIEND_API(bool) obj_defineSetter(JSContext *cx, unsigned argc, js::Value *vp);
#endif #endif

2
js/src/jsobj.h
View File

@ -1112,7 +1112,7 @@ extern const char js_hasOwnProperty_str[];
extern const char js_isPrototypeOf_str[]; extern const char js_isPrototypeOf_str[];
extern const char js_propertyIsEnumerable_str[]; extern const char js_propertyIsEnumerable_str[];
#ifdef OLD_GETTER_SETTER_METHODS #ifdef JS_OLD_GETTER_SETTER_METHODS
extern const char js_defineGetter_str[]; extern const char js_defineGetter_str[];
extern const char js_defineSetter_str[]; extern const char js_defineSetter_str[];
extern const char js_lookupGetter_str[]; extern const char js_lookupGetter_str[];

10
js/src/jsversion.h
View File

@ -52,15 +52,15 @@
* Feature for Object.prototype.__{define,lookup}{G,S}etter__ legacy support; * Feature for Object.prototype.__{define,lookup}{G,S}etter__ legacy support;
* support likely to be made opt-in at some future time. * support likely to be made opt-in at some future time.
*/ */
#define OLD_GETTER_SETTER_METHODS 1 #define JS_OLD_GETTER_SETTER_METHODS 1
/* A kill-switch for bug 586842. Embedders shouldn't touch this! */ /* A kill-switch for bug 586842. Embedders shouldn't touch this! */
#define USE_NEW_OBJECT_REPRESENTATION 0 #define JS_USE_NEW_OBJECT_REPRESENTATION 0
#if USE_NEW_OBJECT_REPRESENTATION #if JS_USE_NEW_OBJECT_REPRESENTATION
# define NEW_OBJECT_REPRESENTATION_ONLY() ((void)0) # define JS_NEW_OBJECT_REPRESENTATION_ONLY() ((void)0)
#else #else
# define NEW_OBJECT_REPRESENTATION_ONLY() \ # define JS_NEW_OBJECT_REPRESENTATION_ONLY() \
MOZ_ASSUME_UNREACHABLE("don't call this! to be used in the new object representation") MOZ_ASSUME_UNREACHABLE("don't call this! to be used in the new object representation")
#endif #endif

12
js/src/vm/ObjectImpl.cpp
View File

@ -561,7 +561,7 @@ bool
js::GetOwnProperty(JSContext *cx, Handle<ObjectImpl*> obj, PropertyId pid_, unsigned resolveFlags, js::GetOwnProperty(JSContext *cx, Handle<ObjectImpl*> obj, PropertyId pid_, unsigned resolveFlags,
PropDesc *desc) PropDesc *desc)
{ {
NEW_OBJECT_REPRESENTATION_ONLY(); JS_NEW_OBJECT_REPRESENTATION_ONLY();
JS_CHECK_RECURSION(cx, return false); JS_CHECK_RECURSION(cx, return false);
@ -651,7 +651,7 @@ bool
js::GetProperty(JSContext *cx, Handle<ObjectImpl*> obj, Handle<ObjectImpl*> receiver, js::GetProperty(JSContext *cx, Handle<ObjectImpl*> obj, Handle<ObjectImpl*> receiver,
Handle<PropertyId> pid, unsigned resolveFlags, MutableHandle<Value> vp) Handle<PropertyId> pid, unsigned resolveFlags, MutableHandle<Value> vp)
{ {
NEW_OBJECT_REPRESENTATION_ONLY(); JS_NEW_OBJECT_REPRESENTATION_ONLY();
MOZ_ASSERT(receiver); MOZ_ASSERT(receiver);
@ -714,7 +714,7 @@ bool
js::GetElement(JSContext *cx, Handle<ObjectImpl*> obj, Handle<ObjectImpl*> receiver, uint32_t index, js::GetElement(JSContext *cx, Handle<ObjectImpl*> obj, Handle<ObjectImpl*> receiver, uint32_t index,
unsigned resolveFlags, Value *vp) unsigned resolveFlags, Value *vp)
{ {
NEW_OBJECT_REPRESENTATION_ONLY(); JS_NEW_OBJECT_REPRESENTATION_ONLY();
Rooted<ObjectImpl*> current(cx, obj); Rooted<ObjectImpl*> current(cx, obj);
@ -777,7 +777,7 @@ bool
js::HasElement(JSContext *cx, Handle<ObjectImpl*> obj, uint32_t index, unsigned resolveFlags, js::HasElement(JSContext *cx, Handle<ObjectImpl*> obj, uint32_t index, unsigned resolveFlags,
bool *found) bool *found)
{ {
NEW_OBJECT_REPRESENTATION_ONLY(); JS_NEW_OBJECT_REPRESENTATION_ONLY();
Rooted<ObjectImpl*> current(cx, obj); Rooted<ObjectImpl*> current(cx, obj);
@ -811,7 +811,7 @@ bool
js::DefineElement(JSContext *cx, Handle<ObjectImpl*> obj, uint32_t index, const PropDesc &desc, js::DefineElement(JSContext *cx, Handle<ObjectImpl*> obj, uint32_t index, const PropDesc &desc,
bool shouldThrow, unsigned resolveFlags, bool *succeeded) bool shouldThrow, unsigned resolveFlags, bool *succeeded)
{ {
NEW_OBJECT_REPRESENTATION_ONLY(); JS_NEW_OBJECT_REPRESENTATION_ONLY();
ElementsHeader &header = obj->elementsHeader(); ElementsHeader &header = obj->elementsHeader();
@ -937,7 +937,7 @@ bool
js::SetElement(JSContext *cx, Handle<ObjectImpl*> obj, Handle<ObjectImpl*> receiver, js::SetElement(JSContext *cx, Handle<ObjectImpl*> obj, Handle<ObjectImpl*> receiver,
uint32_t index, const Value &v, unsigned resolveFlags, bool *succeeded) uint32_t index, const Value &v, unsigned resolveFlags, bool *succeeded)
{ {
NEW_OBJECT_REPRESENTATION_ONLY(); JS_NEW_OBJECT_REPRESENTATION_ONLY();
Rooted<ObjectImpl*> current(cx, obj); Rooted<ObjectImpl*> current(cx, obj);
RootedValue setter(cx); RootedValue setter(cx);

6
js/src/vm/ObjectImpl.h
View File

@ -1284,7 +1284,7 @@ class ObjectImpl : public gc::Cell
} }
bool makeElementsSparse(JSContext *cx) { bool makeElementsSparse(JSContext *cx) {
NEW_OBJECT_REPRESENTATION_ONLY(); JS_NEW_OBJECT_REPRESENTATION_ONLY();
MOZ_ASSUME_UNREACHABLE("NYI"); MOZ_ASSUME_UNREACHABLE("NYI");
} }
@ -1412,7 +1412,7 @@ class ObjectImpl : public gc::Cell
DenseElementsResult ensureDenseElementsInitialized(JSContext *cx, uint32_t index, DenseElementsResult ensureDenseElementsInitialized(JSContext *cx, uint32_t index,
uint32_t extra) uint32_t extra)
{ {
NEW_OBJECT_REPRESENTATION_ONLY(); JS_NEW_OBJECT_REPRESENTATION_ONLY();
MOZ_ASSUME_UNREACHABLE("NYI"); MOZ_ASSUME_UNREACHABLE("NYI");
} }
@ -1623,7 +1623,7 @@ class ObjectImpl : public gc::Cell
} }
ElementsHeader & elementsHeader() const { ElementsHeader & elementsHeader() const {
NEW_OBJECT_REPRESENTATION_ONLY(); JS_NEW_OBJECT_REPRESENTATION_ONLY();
return *ElementsHeader::fromElements(elements); return *ElementsHeader::fromElements(elements);
} }

4
js/src/vm/TypedArrayObject.cpp
View File

@ -43,7 +43,7 @@
#include "vm/GlobalObject-inl.h" #include "vm/GlobalObject-inl.h"
#if USE_NEW_OBJECT_REPRESENTATION #if JS_USE_NEW_OBJECT_REPRESENTATION
// See the comment above OldObjectRepresentationHack. // See the comment above OldObjectRepresentationHack.
# error "TypedArray support for new object representation unimplemented." # error "TypedArray support for new object representation unimplemented."
#endif #endif
@ -294,7 +294,7 @@ PostBarrierTypedArrayObject(JSObject *obj)
// the slots are already being used for the element storage and the private // the slots are already being used for the element storage and the private
// field is used for a delegate object. The ObjectElements header has space // field is used for a delegate object. The ObjectElements header has space
// for it, but I don't want to mess around with adding unions to it with // for it, but I don't want to mess around with adding unions to it with
// USE_NEW_OBJECT_REPRESENTATION pending, since it will solve this much // JS_USE_NEW_OBJECT_REPRESENTATION pending, since it will solve this much
// more cleanly. // more cleanly.
struct OldObjectRepresentationHack { struct OldObjectRepresentationHack {
uint32_t capacity; uint32_t capacity;