diff options
| author | Steve Block <steveblock@google.com> | 2011-07-20 11:27:06 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-20 11:27:06 -0700 |
| commit | ba710948afafd027c21510320fc3545968c8c246 (patch) | |
| tree | f591f609226f986181e69659cf03528585d6727c /Source/WebCore/bridge/jni | |
| parent | 4f25266c21bdd7dcd9996807fae04f7dfb0373de (diff) | |
| parent | 613e4f1d251f223daace8a7450e13eac83198ccd (diff) | |
| download | external_webkit-ba710948afafd027c21510320fc3545968c8c246.zip external_webkit-ba710948afafd027c21510320fc3545968c8c246.tar.gz external_webkit-ba710948afafd027c21510320fc3545968c8c246.tar.bz2 | |
Merge "Update JavaMethodJobject with upstreamed version of fix"
Diffstat (limited to 'Source/WebCore/bridge/jni')
| -rw-r--r-- | Source/WebCore/bridge/jni/JavaMethodJobject.cpp | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/Source/WebCore/bridge/jni/JavaMethodJobject.cpp b/Source/WebCore/bridge/jni/JavaMethodJobject.cpp index 5bb873d..73cae54 100644 --- a/Source/WebCore/bridge/jni/JavaMethodJobject.cpp +++ b/Source/WebCore/bridge/jni/JavaMethodJobject.cpp @@ -130,13 +130,11 @@ const char* JavaMethodJobject::signature() const appendClassName(signatureBuilder, javaClassName.data()); else { signatureBuilder.append(signatureFromJavaType(type)); -#if PLATFORM(ANDROID) && USE(V8) - // FIXME: Upstream to WebKit - // https://bugs.webkit.org/show_bug.cgi?id=62389 - if (type == JavaTypeObject || type == JavaTypeString) { -#else - if (type == JavaTypeObject) { + if (type == JavaTypeObject +#if USE(V8) + || type == JavaTypeString #endif + ) { appendClassName(signatureBuilder, javaClassName.data()); signatureBuilder.append(';'); } @@ -149,13 +147,11 @@ const char* JavaMethodJobject::signature() const appendClassName(signatureBuilder, returnType); else { signatureBuilder.append(signatureFromJavaType(m_returnType)); -#if PLATFORM(ANDROID) && USE(V8) - // FIXME: Upstream to WebKit - // https://bugs.webkit.org/show_bug.cgi?id=62389 - if (m_returnType == JavaTypeObject || m_returnType == JavaTypeString) { -#else - if (m_returnType == JavaTypeObject) { + if (m_returnType == JavaTypeObject +#if USE(V8) + || m_returnType == JavaTypeString #endif + ) { appendClassName(signatureBuilder, returnType); signatureBuilder.append(';'); } |