From 7d914f10c042bcd243dce3f7b5c26cc470c0f38f Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Tue, 7 Jun 2011 11:45:31 +0100
Subject: Merge WebKit at r84325: Fix uses of JavaInstance.

The JavaInstance class is now an interface, so use the
provided JavaInstanceJobject implementation instead.

See http://trac.webkit.org/changeset/82950

Change-Id: I782e3887e4f059733fbc054ca1d9d97d94e817ef
---
 Source/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp   | 2 +-
 Source/WebCore/bridge/jni/v8/JavaInstanceJobjectV8.h | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'Source/WebCore/bridge')

diff --git a/Source/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp b/Source/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp
index 4c9e240..cd04634 100644
--- a/Source/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp
+++ b/Source/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp
@@ -209,7 +209,7 @@ JavaValue convertNPVariantToJavaValue(NPVariant value, const String& javaClass)
                 break;
             }
 
-            result.m_objectValue = adoptRef(new JavaInstance(javaArray));
+            result.m_objectValue = adoptRef(new JavaInstanceJobject(javaArray));
         }
         break;
 #endif // PLATFORM(ANDROID)
diff --git a/Source/WebCore/bridge/jni/v8/JavaInstanceJobjectV8.h b/Source/WebCore/bridge/jni/v8/JavaInstanceJobjectV8.h
index 9f86037..bb38e77 100644
--- a/Source/WebCore/bridge/jni/v8/JavaInstanceJobjectV8.h
+++ b/Source/WebCore/bridge/jni/v8/JavaInstanceJobjectV8.h
@@ -36,6 +36,10 @@
 #include <wtf/OwnPtr.h>
 #include <wtf/RefPtr.h>
 
+#ifdef ANDROID
+#include "JavaClassV8.h"
+#endif
+
 using namespace WTF;
 
 namespace JSC {
-- 
cgit v1.1