[webkit-changes] cvs commit: JavaScriptCore/bindings/jni
jni_jsobject.cpp
Geoffrey
ggaren at opensource.apple.com
Thu Dec 29 02:11:23 PST 2005
ggaren 05/12/29 02:11:23
Modified: . ChangeLog
bindings/jni jni_jsobject.cpp
Log:
Reviewed by darin.
- Fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=6265
Name change regression: Java doesn't know what JavaJSObject is
Changed strings passed to Java back to original "JSObject".
* bindings/jni/jni_jsobject.cpp:
(JavaJSObject::convertValueToJObject):
(JavaJSObject::convertJObjectToValue):
Revision Changes Path
1.937 +13 -0 JavaScriptCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/JavaScriptCore/ChangeLog,v
retrieving revision 1.936
retrieving revision 1.937
diff -u -r1.936 -r1.937
--- ChangeLog 29 Dec 2005 08:18:39 -0000 1.936
+++ ChangeLog 29 Dec 2005 10:11:21 -0000 1.937
@@ -1,3 +1,16 @@
+2005-12-29 Geoffrey Garen <ggaren at apple.com>
+
+ Reviewed by darin.
+
+ - Fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=6265
+ Name change regression: Java doesn't know what JavaJSObject is
+
+ Changed strings passed to Java back to original "JSObject".
+
+ * bindings/jni/jni_jsobject.cpp:
+ (JavaJSObject::convertValueToJObject):
+ (JavaJSObject::convertJObjectToValue):
+
2005-12-28 Anders Carlsson <andersca at mac.com>
Reviewed by Maciej.
1.19 +4 -4 JavaScriptCore/bindings/jni/jni_jsobject.cpp
Index: jni_jsobject.cpp
===================================================================
RCS file: /cvs/root/JavaScriptCore/bindings/jni/jni_jsobject.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jni_jsobject.cpp 11 Dec 2005 02:05:36 -0000 1.18
+++ jni_jsobject.cpp 29 Dec 2005 10:11:23 -0000 1.19
@@ -380,11 +380,11 @@
// location and in the original Java 1.4.2 location.
jclass JSObjectClass;
- JSObjectClass = env->FindClass ("sun/plugin/javascript/webkit/JavaJSObject");
+ JSObjectClass = env->FindClass ("sun/plugin/javascript/webkit/JSObject");
if (!JSObjectClass) {
env->ExceptionDescribe();
env->ExceptionClear();
- JSObjectClass = env->FindClass ("apple/applet/JavaJSObject");
+ JSObjectClass = env->FindClass ("apple/applet/JSObject");
}
jmethodID constructorID = env->GetMethodID (JSObjectClass, "<init>", "(J)V");
@@ -398,7 +398,7 @@
JSValue *JavaJSObject::convertJObjectToValue (jobject theObject) const
{
- // Instances of netscape.javascript.JavaJSObject get converted back to
+ // Instances of netscape.javascript.JSObject get converted back to
// JavaScript objects. All other objects are wrapped. It's not
// possible to pass primitive types from the Java to JavaScript.
// See section 22.7 of 'JavaScript: The Definitive Guide, 4th Edition',
@@ -406,7 +406,7 @@
jobject classOfInstance = callJNIObjectMethod(theObject, "getClass", "()Ljava/lang/Class;");
jstring className = (jstring)callJNIObjectMethod(classOfInstance, "getName", "()Ljava/lang/String;");
- if (strcmp(Bindings::JavaString(className).UTF8String(), "netscape.javascript.JavaJSObject") == 0) {
+ if (strcmp(Bindings::JavaString(className).UTF8String(), "netscape.javascript.JSObject") == 0) {
// Pull the nativeJSObject value from the Java instance. This is a
// pointer to the JSObject.
JNIEnv *env = getJNIEnv();
More information about the webkit-changes
mailing list