Merge change I998a5863 into eclair-mr2

* changes:
  Use NPAPI headers from WebCore/bridge/ rather than those from V8Bindings/npapi/.

1 files changed, 6 insertions, 1 deletions

diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp
index d6aa3f6..0675bcb 100644
--- a/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -1244,7 +1244,12 @@ static void AddJavascriptInterface(JNIEnv *env, jobject obj, jint nativeFramePoi
         // the ref count when the object is not reachable from JavaScript
         // side. Code here must release the reference count increased by
         // JavaInstanceToNPObject.
-        _NPN_ReleaseObject(obj);
+
+        // Note that while this function is declared in WebCore/bridge/npruntime.h, for V8 builds
+        // 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);
         JSC::Bindings::releaseCharactersForJString(interfaceName, name);
     }
 #endif