diff options
| author | Steve Block <steveblock@chromium.org> | 2012-02-16 10:07:32 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-02-16 12:19:54 +0000 |
| commit | 9d5e9234a371d13bf55a779a6257ae5e277bfb1b (patch) | |
| tree | 6a61ed35840162994c20fcf46726c75b8f96ac70 /Source/WebCore/bridge | |
| parent | 072ed0a209fd8f03b226c5c0fcea994b587c1e66 (diff) | |
| download | external_webkit-9d5e9234a371d13bf55a779a6257ae5e277bfb1b.zip external_webkit-9d5e9234a371d13bf55a779a6257ae5e277bfb1b.tar.gz external_webkit-9d5e9234a371d13bf55a779a6257ae5e277bfb1b.tar.bz2 | |
Remove JSC-specific code and V8 guards from Android-specific code
Also removes such code from downstream edits to non-Android-specific code.
Bug: 5495373
Change-Id: I478824af2e6ff0eff9a43a9534c2a5ee0e99e9f8
Diffstat (limited to 'Source/WebCore/bridge')
| -rw-r--r-- | Source/WebCore/bridge/jni/JavaMethodJobject.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebCore/bridge/jni/JavaMethodJobject.cpp b/Source/WebCore/bridge/jni/JavaMethodJobject.cpp index 01a0b5b..f93e197 100644 --- a/Source/WebCore/bridge/jni/JavaMethodJobject.cpp +++ b/Source/WebCore/bridge/jni/JavaMethodJobject.cpp @@ -131,9 +131,9 @@ const char* JavaMethodJobject::signature() const else { signatureBuilder.append(signatureFromJavaType(type)); if (type == JavaTypeObject -#if USE(V8) +// ANDROID || type == JavaTypeString -#endif +// ANDROID ) { appendClassName(signatureBuilder, javaClassName.data()); signatureBuilder.append(';'); @@ -148,9 +148,9 @@ const char* JavaMethodJobject::signature() const else { signatureBuilder.append(signatureFromJavaType(m_returnType)); if (m_returnType == JavaTypeObject -#if USE(V8) +// ANDROID || m_returnType == JavaTypeString -#endif +// ANDROID ) { appendClassName(signatureBuilder, returnType); signatureBuilder.append(';'); |