commit 099454d1bf20965697a95734e0f78c4b328d433f
author fmalita@google.com <fmalita@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Fri Mar 18 10:57:16 2011 +0000
committer fmalita@google.com <fmalita@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Fri Mar 18 10:57:16 2011 +0000
tree a3f1117744ce16716dd50f3d3b4f88026031604d
parent a551e6228638608141297eff7a8dc98e18fe07bf

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


git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@9863 8db76d5a-ed1c-0410-87a9-c151d255dfc7

plugins/xpcom/JavaObject.cpp

diff --git a/plugins/xpcom/JavaObject.cpp b/plugins/xpcom/JavaObject.cpp
index 61d1c8e..440858f 100644
--- a/plugins/xpcom/JavaObject.cpp
+++ b/plugins/xpcom/JavaObject.cpp
@@ -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;

plugins/xpcom/JavaObject.h

diff --git a/plugins/xpcom/JavaObject.h b/plugins/xpcom/JavaObject.h
index 29b6cb3..acfb0a9 100755
--- a/plugins/xpcom/JavaObject.h
+++ b/plugins/xpcom/JavaObject.h
@@ -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);