Revision: 9863
Author: [email protected]
Date: Fri Mar 18 03:57:16 2011
Log: Devmode support for Firefox >= 4b12.
Mozilla commit http://hg.mozilla.org/releases/mozilla-2.0/rev/4b56bfdf61a7
changed the JSAPI property setter method signature. This adds devmode
support for the updated API.
Review at http://gwt-code-reviews.appspot.com/1383803
http://code.google.com/p/google-web-toolkit/source/detail?r=9863
Modified:
/trunk/plugins/xpcom/JavaObject.cpp
/trunk/plugins/xpcom/JavaObject.h
=======================================
--- /trunk/plugins/xpcom/JavaObject.cpp Wed Jan 12 11:43:57 2011
+++ /trunk/plugins/xpcom/JavaObject.cpp Fri Mar 18 03:57:16 2011
@@ -169,8 +169,14 @@
return JS_TRUE;
}
+#if GECKO_VERSION < 2000
JSBool JavaObject::setProperty(JSContext* ctx, JSObject* obj, jsid id,
jsval* vp) {
+#else
+JSBool JavaObject::setProperty(JSContext* ctx, JSObject* obj, jsid id,
+ JSBool strict, jsval* vp) {
+#endif //GECKO_VERSION
+
Debug::log(Debug::Spam) << "JavaObject::setProperty obj=" << obj <<
Debug::flush;
if (!JSID_IS_INT(id)) {
Debug::log(Debug::Error) << " Error: setting string property id" <<
Debug::flush;
=======================================
--- /trunk/plugins/xpcom/JavaObject.h Wed Jan 12 11:43:57 2011
+++ /trunk/plugins/xpcom/JavaObject.h Fri Mar 18 03:57:16 2011
@@ -39,7 +39,13 @@
static JSObject* construct(JSContext* ctx, SessionData* data, int
objectRef);
static int getObjectId(JSContext* ctx, JSObject* obj);
static JSBool getProperty(JSContext* ctx, JSObject* obj, jsid id, jsval*
vp);
+
+#if GECKO_VERSION < 2000
static JSBool setProperty(JSContext* ctx, JSObject* obj, jsid id, jsval*
vp);
+#else
+ static JSBool setProperty(JSContext* ctx, JSObject* obj, jsid id, JSBool
strict, jsval* vp);
+#endif //GECKO_VERSION
+
static JSBool resolve(JSContext* ctx, JSObject* obj, jsval id);
static JSBool convert(JSContext* cx, JSObject* obj, JSType type, jsval*
vp);
static JSBool enumerate(JSContext* ctx, JSObject* obj, JSIterateOp op,
jsval* statep, jsid* idp);
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
