diff options
| -rw-r--r-- | WebKit/android/jni/WebCoreFrameBridge.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp index 84cd70c..2e1d110 100644 --- a/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -1308,8 +1308,8 @@ 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* obj = JavaInstanceToNPObject(addedObject.releaseRef()); - pFrame->script()->bindToWindowObject(pFrame, name, obj); + NPObject* npObject = JavaInstanceToNPObject(addedObject.releaseRef()); + pFrame->script()->bindToWindowObject(pFrame, name, npObject); // bindToWindowObject calls NPN_RetainObject on the // returned one (see createV8ObjectForNPObject in V8NPObject.cpp). // bindToWindowObject also increases obj's ref count and decreases @@ -1321,7 +1321,7 @@ static void AddJavascriptInterface(JNIEnv *env, jobject obj, jint nativeFramePoi // we use WebCore/bindings/v8/npruntime.cpp (rather than // WebCore/bridge/npruntime.cpp), so the function is implemented there. // TODO: Combine the two versions of these NPAPI files. - NPN_ReleaseObject(obj); + NPN_ReleaseObject(npObject); releaseCharactersForJString(interfaceName, name); } #endif |