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 | 4 |
3 files changed, 4 insertions, 8 deletions
diff --git a/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp b/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp index 7aa55b5..3bb8e27 100644 --- a/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp +++ b/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp @@ -68,9 +68,7 @@ static NPClass JavaNPObjectClass = { 0 // construct }; -// ANDROID-specific change. TODO: Upstream -NPObject* JavaInstanceToNPObject(PassRefPtr<JavaInstance> instance) -// END ANDROID-specific change +NPObject* JavaInstanceToNPObject(JavaInstance* instance) { 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 e68a5aa..31b0ac7 100644 --- a/WebCore/bridge/jni/v8/JavaNPObjectV8.h +++ b/WebCore/bridge/jni/v8/JavaNPObjectV8.h @@ -41,9 +41,7 @@ struct JavaNPObject { RefPtr<JavaInstance> m_instance; }; -// ANDROID-specific change. TODO: Upstream -NPObject* JavaInstanceToNPObject(PassRefPtr<JavaInstance>); -// END ANDROID-specific change +NPObject* JavaInstanceToNPObject(JavaInstance*); JavaInstance* ExtractJavaInstance(NPObject*); bool JavaNPObjectHasMethod(NPObject*, NPIdentifier name); diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp index f800e2d..eff64e1 100644 --- a/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -1702,10 +1702,10 @@ static void AddJavascriptInterface(JNIEnv *env, jobject obj, jint nativeFramePoi } #elif USE(V8) if (pFrame) { - PassRefPtr<JavaInstance> addedObject = WeakJavaInstance::create(javascriptObj); + RefPtr<JavaInstance> addedObject = WeakJavaInstance::create(javascriptObj); const char* name = getCharactersFromJStringInEnv(env, interfaceName); // Pass ownership of the added object to bindToWindowObject. - NPObject* npObject = JavaInstanceToNPObject(addedObject); + NPObject* npObject = JavaInstanceToNPObject(addedObject.get()); pFrame->script()->bindToWindowObject(pFrame, name, npObject); // bindToWindowObject calls NPN_RetainObject on the // returned one (see createV8ObjectForNPObject in V8NPObject.cpp). |