From 2bde8e466a4451c7319e3a072d118917957d6554 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 25 May 2011 19:08:45 +0100 Subject: Merge WebKit at r82507: Initial merge by git Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e --- Source/WebCore/bridge/jni/jni_jsobject.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/WebCore/bridge/jni/jni_jsobject.mm') diff --git a/Source/WebCore/bridge/jni/jni_jsobject.mm b/Source/WebCore/bridge/jni/jni_jsobject.mm index 172559e..03b8fc2 100644 --- a/Source/WebCore/bridge/jni/jni_jsobject.mm +++ b/Source/WebCore/bridge/jni/jni_jsobject.mm @@ -419,7 +419,7 @@ jstring JavaJSObject::toString() const JSObject *thisObj = const_cast(_imp); ExecState* exec = rootObject->globalObject()->globalExec(); - return static_cast(convertValueToJValue(exec, rootObject, thisObj, object_type, "java.lang.String").l); + return static_cast(convertValueToJValue(exec, rootObject, thisObj, JavaTypeObject, "java.lang.String").l); } void JavaJSObject::finalize() const -- cgit v1.1