Fix development mode Firefox plugin to work on with Firefox 15 on Linux. Tested with 64-bit linux. Now builds 32-bit Linux for 15, but that's not tested yet. Review at http://gwt-code-reviews.appspot.com/1817803 Review by: acleung@google.com git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@11245 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/plugins/xpcom/JavaObject.cpp b/plugins/xpcom/JavaObject.cpp index e521ef9..e54aa48 100644 --- a/plugins/xpcom/JavaObject.cpp +++ b/plugins/xpcom/JavaObject.cpp
@@ -382,7 +382,7 @@ #ifdef JSVAL_IS_OBJECT !JSVAL_IS_OBJECT(argv[1])) { #else - JSVAL_IS_PRIMITIVE(argv[1])) { + (JSVAL_IS_PRIMITIVE(argv[1]) && !JSVAL_IS_NULL(argv[1]))) { #endif Debug::log(Debug::Error) << "JavaObject::call incorrect arguments" << Debug::flush; return JS_FALSE;
diff --git a/plugins/xpcom/Makefile b/plugins/xpcom/Makefile index 81bda59..594dc64 100644 --- a/plugins/xpcom/Makefile +++ b/plugins/xpcom/Makefile
@@ -280,6 +280,7 @@ $(MAKE) lib BROWSER=ff120 ARCH=x86 $(MAKE) lib BROWSER=ff130 ARCH=x86 $(MAKE) lib BROWSER=ff140 ARCH=x86 + $(MAKE) lib BROWSER=ff150 ARCH=x86 $(MAKE) lib BROWSER=ff3 ARCH=x86_64 $(MAKE) lib BROWSER=ff3+ ARCH=x86_64 $(MAKE) lib BROWSER=ff35 ARCH=x86_64
diff --git a/plugins/xpcom/prebuilt/extension/chrome.manifest b/plugins/xpcom/prebuilt/extension/chrome.manifest index 9248539..dc2a767 100644 --- a/plugins/xpcom/prebuilt/extension/chrome.manifest +++ b/plugins/xpcom/prebuilt/extension/chrome.manifest
@@ -80,5 +80,10 @@ binary-component lib/Darwin-gcc3/ff140/libgwt_dev_ff140.dylib ABI=Darwin_x86-gcc3 appversion<=14.0.* binary-component lib/WINNT_x86-msvc/ff140/xpGwtDevPlugin.dll ABI=WINNT_x86-msvc appversion<=14.0.* +# Firefox 15 +binary-component lib/Linux_x86_64-gcc3/ff150/libgwt_dev_ff150.so ABI=Linux_x86_64-gcc3 appversion<=15.0.* +binary-component lib/Linux_x86-gcc3/ff150/libgwt_dev_ff150.so ABI=Linux_x86-gcc3 appversion<=15.0.* + + interfaces components/IOOPHM.xpt contract @gwt.google.com/ExternalWrapper;1 {028DD88B-6D65-401D-AAFD-17E497D15D09}