From f9e2d1c1e36096aa7721f4ce753d0a90c25826bc Mon Sep 17 00:00:00 2001 From: Steve Block Date: Tue, 7 Jun 2011 15:45:49 +0100 Subject: Merge WebKit at r82507: JNIType renamed to JavaType See http://trac.webkit.org/changeset/81860 Change-Id: I7ba9cf3f5a739f4d94e9189f6eb6dd4f8f645787 --- Source/WebCore/platform/android/TemporaryLinkStubs.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/WebCore/platform') 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::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(); -- cgit v1.1