JavaScriptCore:

Reviewed by Darin, landed by Anders. Fix for: http://bugs.webkit.org/show_bug.cgi?id=13142 The previous fix http://bugs.webkit.org/show_bug.cgi?id=12636 introduced new JNIType to enum in jni_utility.h This is a problem on the Mac as it seems that the JNIType enum is also used in the JVM, it is used to specify the return type in jni_objc.mm Corrected the fix by moving type to the end, and changing jni_objc.mm to convert the new type to an old compatible type. * bindings/jni/jni_objc.mm: (KJS::Bindings::dispatchJNICall): * bindings/jni/jni_utility.h: WebCore: Reviewed by Darin, landed by Anders. Manual test case for http://bugs.webkit.org/show_bug.cgi?id=13142 * manual-tests/liveconnect-applet-get-boolean.html: Added. * manual-tests/resources/CheckerApplet.class: Added. * manual-tests/resources/CheckerApplet.java: Added. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@20502 268f45cc-cd09-0410-ab3c-d52691b4dbfc
rjbailey · Mar 27, 2007 · 8a51861 · 8a51861
1 parent 7f11a58
commit 8a51861
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 2 deletions.
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
@@ -1,3 +1,22 @@
+2007-03-26  David Carson  <dacarson@gmail.com>
+
+        Reviewed by Darin, landed by Anders.
+
+        Fix for: http://bugs.webkit.org/show_bug.cgi?id=13142
+
+        The previous fix http://bugs.webkit.org/show_bug.cgi?id=12636 
+        introduced new JNIType to enum in jni_utility.h This is a 
+        problem on the Mac as it seems that the JNIType enum is also
+        used in the JVM, it is used to specify the return type in
+        jni_objc.mm
+        Corrected the fix by moving type to the end, and changing
+        jni_objc.mm to convert the new type to an old compatible
+        type.
+
+        * bindings/jni/jni_objc.mm:
+        (KJS::Bindings::dispatchJNICall):
+        * bindings/jni/jni_utility.h:
+
 2007-03-26  Christopher Brichford  <chrisb@adobe.com>
 
         Reviewed/landed by Adam.

diff --git a/JavaScriptCore/bindings/jni/jni_objc.mm b/JavaScriptCore/bindings/jni/jni_objc.mm
@@ -44,6 +44,10 @@ - (jvalue)webPlugInCallJava:(jobject)object
 {
     id view = (id)targetAppletView;
 
+    // As array_type is not known by the Mac JVM, change it to a compatible type.
+    if (returnType == array_type)
+        returnType = object_type;
+
     if ([view respondsToSelector:@selector(webPlugInCallJava:isStatic:returnType:method:arguments:callingURL:exceptionDescription:)]) {
         NSString *_exceptionDescription = 0;
 

diff --git a/JavaScriptCore/bindings/jni/jni_utility.h b/JavaScriptCore/bindings/jni/jni_utility.h
@@ -29,19 +29,24 @@
 
 #include <JavaVM/jni.h>
 
+// The order of these items can not be modified as they are tightly
+// bound with the JVM on Mac OSX. If new types need to be added, they
+// should be added to the end. It is used in jni_obc.mm when calling
+// through to the JVM. Newly added items need to be made compatible
+// in that file.
 typedef enum {
     invalid_type = 0,
     void_type,
     object_type,
-    array_type,
     boolean_type,
     byte_type,
     char_type,
     short_type,
     int_type,
     long_type,
     float_type,
-    double_type
+    double_type,
+    array_type
 } JNIType;
 
 namespace KJS {

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2007-03-26  David Carson  <dacarson@gmail.com>
+
+        Reviewed by Darin, landed by Anders.
+
+        Manual test case for http://bugs.webkit.org/show_bug.cgi?id=13142
+
+        * manual-tests/liveconnect-applet-get-boolean.html: Added.
+        * manual-tests/resources/CheckerApplet.class: Added.
+        * manual-tests/resources/CheckerApplet.java: Added.
+
 2007-03-26  Mitz Pettel  <mitz@webkit.org>
 
         Reviewed and landed by Darin.

diff --git a/WebCore/manual-tests/liveconnect-applet-get-boolean.html b/WebCore/manual-tests/liveconnect-applet-get-boolean.html
@@ -0,0 +1,7 @@
+<html>
+<body><applet code="CheckerApplet.class" name="Checker" codebase="resources">
+Unable to load applet.</applet>
+This tests retrieving a boolean value from a Java class using javascript. It tests the return value. The return value should be true.<br>
+<input type="button" name="test" value="Read applet" onClick="alert('return value: '+document.Checker.checkVersion())"/>
+</body>
+<html>
diff --git a/WebCore/manual-tests/resources/CheckerApplet.class b/WebCore/manual-tests/resources/CheckerApplet.class
diff --git a/WebCore/manual-tests/resources/CheckerApplet.java b/WebCore/manual-tests/resources/CheckerApplet.java
@@ -0,0 +1,21 @@
+import java.applet.Applet;
+import java.awt.Color;
+import java.awt.Component;
+
+public class CheckerApplet extends Applet
+{
+
+    public boolean checkVersion()
+    {
+        return true;
+    }
+
+    public void start()
+    {
+        setBackground(new Color(255, 255, 255));
+    }
+
+    public CheckerApplet()
+    {
+    }
+}