diff options
| author | Steve Block <steveblock@google.com> | 2011-06-07 15:45:49 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 16:02:08 +0100 |
| commit | f9e2d1c1e36096aa7721f4ce753d0a90c25826bc (patch) | |
| tree | 5f529269ef05aabaf37aafd4ca86921c8d1d04f1 /Source/WebCore/platform/android | |
| parent | f25579c312629288541e80e03be1b6c08c609942 (diff) | |
| download | external_webkit-f9e2d1c1e36096aa7721f4ce753d0a90c25826bc.zip external_webkit-f9e2d1c1e36096aa7721f4ce753d0a90c25826bc.tar.gz external_webkit-f9e2d1c1e36096aa7721f4ce753d0a90c25826bc.tar.bz2 | |
Merge WebKit at r82507: JNIType renamed to JavaType
See http://trac.webkit.org/changeset/81860
Change-Id: I7ba9cf3f5a739f4d94e9189f6eb6dd4f8f645787
Diffstat (limited to 'Source/WebCore/platform/android')
| -rw-r--r-- | Source/WebCore/platform/android/TemporaryLinkStubs.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/platform/android/TemporaryLinkStubs.cpp b/Source/WebCore/platform/android/TemporaryLinkStubs.cpp index ede06dc..ca9f24d 100644 --- a/Source/WebCore/platform/android/TemporaryLinkStubs.cpp +++ b/Source/WebCore/platform/android/TemporaryLinkStubs.cpp @@ -396,7 +396,7 @@ PassRefPtr<SharedBuffer> SharedBuffer::createWithContentsOfFile(const String&) #if USE(JSC) namespace JSC { namespace Bindings { -bool dispatchJNICall(ExecState*, const void* targetAppletView, jobject obj, bool isStatic, JNIType returnType, +bool dispatchJNICall(ExecState*, const void* targetAppletView, jobject obj, bool isStatic, JavaType returnType, jmethodID methodID, jvalue* args, jvalue& result, const char* callingURL, JSValue& exceptionDescription) { notImplemented(); |