summaryrefslogtreecommitdiffstats
path: root/WebCore
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore')
-rw-r--r--WebCore/bridge/jni/v8/JavaNPObjectV8.cpp4
-rw-r--r--WebCore/bridge/jni/v8/JavaNPObjectV8.h4
2 files changed, 6 insertions, 2 deletions
diff --git a/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp b/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp
index 808de03..9c39c25 100644
--- a/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp
+++ b/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp
@@ -68,7 +68,9 @@ static NPClass JavaNPObjectClass = {
0 // construct
};
-NPObject* JavaInstanceToNPObject(JavaInstance* instance)
+// ANDROID-specific change. TODO: Upstream
+NPObject* JavaInstanceToNPObject(PassRefPtr<JavaInstance> instance)
+// END ANDROID-specific change
{
JavaNPObject* object = reinterpret_cast<JavaNPObject*>(_NPN_CreateObject(0, &JavaNPObjectClass));
object->m_instance = instance;
diff --git a/WebCore/bridge/jni/v8/JavaNPObjectV8.h b/WebCore/bridge/jni/v8/JavaNPObjectV8.h
index 31b0ac7..e68a5aa 100644
--- a/WebCore/bridge/jni/v8/JavaNPObjectV8.h
+++ b/WebCore/bridge/jni/v8/JavaNPObjectV8.h
@@ -41,7 +41,9 @@ struct JavaNPObject {
RefPtr<JavaInstance> m_instance;
};
-NPObject* JavaInstanceToNPObject(JavaInstance*);
+// ANDROID-specific change. TODO: Upstream
+NPObject* JavaInstanceToNPObject(PassRefPtr<JavaInstance>);
+// END ANDROID-specific change
JavaInstance* ExtractJavaInstance(NPObject*);
bool JavaNPObjectHasMethod(NPObject*, NPIdentifier name);