author | Mike Hommey <mh+mozilla@glandium.org> |
Thu, 13 May 2010 09:45:33 +0200 | |
changeset 42260 | 85e10f4b4a9e098056ba9025ffaccfcaca5f6bae |
parent 42259 | 1feb28f1d898b018aaa4b733e2ec319971406a1d |
child 42261 | 549f77777959e87a5f439902cd9787ceb8d57d2c |
push id | 13247 |
push user | mh@glandium.org |
push date | Thu, 13 May 2010 09:31:03 +0000 |
treeherder | mozilla-central@85e10f4b4a9e [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | jwalden |
bugs | 555920 |
milestone | 1.9.3a5pre |
first release with | nightly linux32
85e10f4b4a9e
/
3.7a5pre
/
20100513030113
/
files
nightly linux64
85e10f4b4a9e
/
3.7a5pre
/
20100513030716
/
files
nightly mac
85e10f4b4a9e
/
3.7a5pre
/
20100513030641
/
files
nightly win32
85e10f4b4a9e
/
3.7a5pre
/
20100513040229
/
files
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
|
releases | nightly linux32
3.7a5pre
/
20100513030113
/
pushlog to previous
nightly linux64
3.7a5pre
/
20100513030716
/
pushlog to previous
nightly mac
3.7a5pre
/
20100513030641
/
pushlog to previous
nightly win32
3.7a5pre
/
20100513040229
/
pushlog to previous
|
--- a/js/src/jscntxt.cpp +++ b/js/src/jscntxt.cpp @@ -966,17 +966,17 @@ js_WaitForGC(JSRuntime *rt) static JSDHashNumber resolving_HashKey(JSDHashTable *table, const void *ptr) { const JSResolvingKey *key = (const JSResolvingKey *)ptr; return (JSDHashNumber(uintptr_t(key->obj)) >> JSVAL_TAGBITS) ^ key->id; } -JS_PUBLIC_API(JSBool) +static JSBool resolving_MatchEntry(JSDHashTable *table, const JSDHashEntryHdr *hdr, const void *ptr) { const JSResolvingEntry *entry = (const JSResolvingEntry *)hdr; const JSResolvingKey *key = (const JSResolvingKey *)ptr; return entry->key.obj == key->obj && entry->key.id == key->id;
--- a/js/src/jsobj.h +++ b/js/src/jsobj.h @@ -812,16 +812,21 @@ js_HasOwnPropertyHelper(JSContext *cx, J extern JSBool js_HasOwnProperty(JSContext *cx, JSLookupPropOp lookup, JSObject *obj, jsid id, JSObject **objp, JSProperty **propp); extern JSBool js_PropertyIsEnumerable(JSContext *cx, JSObject *obj, jsid id, jsval *vp); +#ifdef OLD_GETTER_SETTER_METHODS +JS_FRIEND_API(JSBool) js_obj_defineGetter(JSContext *cx, uintN argc, jsval *vp); +JS_FRIEND_API(JSBool) js_obj_defineSetter(JSContext *cx, uintN argc, jsval *vp); +#endif + extern JSObject * js_InitEval(JSContext *cx, JSObject *obj); extern JSObject * js_InitObjectClass(JSContext *cx, JSObject *obj); extern JSObject * js_InitClass(JSContext *cx, JSObject *obj, JSObject *parent_proto,
--- a/js/src/xpconnect/src/xpcquickstubs.cpp +++ b/js/src/xpconnect/src/xpcquickstubs.cpp @@ -320,20 +320,16 @@ SharedLookupGetter(JSContext *cx, uintN } static JSBool SharedLookupSetter(JSContext *cx, uintN argc, jsval *vp) { return LookupGetterOrSetter(cx, PR_FALSE, argc, vp); } -// XXX Hack! :-/ -JS_FRIEND_API(JSBool) js_obj_defineGetter(JSContext *cx, uintN argc, jsval *vp); -JS_FRIEND_API(JSBool) js_obj_defineSetter(JSContext *cx, uintN argc, jsval *vp); - static JSBool DefineGetterOrSetter(JSContext *cx, uintN argc, JSBool wantGetter, jsval *vp) { uintN attrs; JSBool found; JSPropertyOp getter, setter; JSObject *obj2; jsval v;