diff options
| -rw-r--r-- | WebCore/bridge/jni/v8/JavaNPObjectV8.cpp | 4 | ||||
| -rw-r--r-- | WebCore/bridge/jni/v8/JavaNPObjectV8.h | 4 | ||||
| -rw-r--r-- | WebKit/android/jni/WebCoreFrameBridge.cpp | 2 |
3 files changed, 7 insertions, 3 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); diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp index afabde8..db85357 100644 --- a/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -1307,7 +1307,7 @@ static void AddJavascriptInterface(JNIEnv *env, jobject obj, jint nativeFramePoi PassRefPtr<JavaInstance> addedObject = WeakJavaInstance::create(javascriptObj); const char* name = getCharactersFromJStringInEnv(env, interfaceName); // Pass ownership of the added object to bindToWindowObject. - NPObject* npObject = JavaInstanceToNPObject(addedObject.releaseRef()); + NPObject* npObject = JavaInstanceToNPObject(addedObject); pFrame->script()->bindToWindowObject(pFrame, name, npObject); // bindToWindowObject calls NPN_RetainObject on the // returned one (see createV8ObjectForNPObject in V8NPObject.cpp). |