diff options
| author | Steve Block <steveblock@google.com> | 2010-05-21 09:59:46 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-21 09:59:46 +0100 |
| commit | 64dfb67035aea47a8d798192a43226d3ec739d25 (patch) | |
| tree | 75ce14ca999c61308bfaedde4f57eaf7907f54b1 /WebCore | |
| parent | cbb11248c4cee2a74b3352860b1cf703552483fb (diff) | |
| download | external_webkit-64dfb67035aea47a8d798192a43226d3ec739d25.zip external_webkit-64dfb67035aea47a8d798192a43226d3ec739d25.tar.gz external_webkit-64dfb67035aea47a8d798192a43226d3ec739d25.tar.bz2 | |
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
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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()) { |