From 64dfb67035aea47a8d798192a43226d3ec739d25 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Fri, 21 May 2010 09:59:46 +0100 Subject: Cherry-pick WebKit change 59918 to fix Java bridge for JSC This is required to allow the LayoutTestController to work. See http://trac.webkit.org/changeset/59918 Change-Id: I96ab4a0da1ebb9e42cff43e4296341830d57f078 --- WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'WebCore') diff --git a/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp b/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp index 008d1ab..8959189 100644 --- a/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp +++ b/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp @@ -198,7 +198,9 @@ JSValue JavaInstance::invokeMethod(ExecState* exec, RuntimeMethod* runtimeMethod } } -#ifdef BUILDING_ON_TIGER +// This is a deprecated code path which should not be required on Android. +// Remove this guard once Bug 39476 is fixed. +#if PLATFORM(ANDROID) || defined(BUILDING_ON_TIGER) if (!handled) { jobject obj = m_instance->m_instance; switch (jMethod->JNIReturnType()) { -- cgit v1.1