diff options
| author | Steve Block <steveblock@google.com> | 2010-05-24 04:40:14 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-05-24 04:40:14 -0700 |
| commit | 456bff2bd280c649e2600ab43edf65e0d4e7e217 (patch) | |
| tree | 20d6771fcf2c34a3433b9e0b7a59ff692cd43226 | |
| parent | fc79bbb3ba729acaeee5f96e24ec8b48e4234ebe (diff) | |
| parent | 64dfb67035aea47a8d798192a43226d3ec739d25 (diff) | |
| download | external_webkit-456bff2bd280c649e2600ab43edf65e0d4e7e217.zip external_webkit-456bff2bd280c649e2600ab43edf65e0d4e7e217.tar.gz external_webkit-456bff2bd280c649e2600ab43edf65e0d4e7e217.tar.bz2 | |
Merge "Cherry-pick WebKit change 59918 to fix Java bridge for JSC"
| -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()) { |