commit b4a23918d35287231c841d3f3f8a41f88b76148c
author Derek Sollenberger <djsollen@google.com> Mon Nov 09 15:38:58 2009 -0500
committer Derek Sollenberger <djsollen@google.com> Mon Nov 09 15:38:58 2009 -0500
tree 486089c585f87de4bb6686e8eafac1f1024b1b34
parent e458201d1ab45d9b72027d3d319d16810bf0b94f

Updating sample plugin to test java class loading.

samples/BrowserPlugin/jni/main.cpp

diff --git a/samples/BrowserPlugin/jni/main.cpp b/samples/BrowserPlugin/jni/main.cpp
index 6f0ed96..4bc825e 100644
--- a/samples/BrowserPlugin/jni/main.cpp
+++ b/samples/BrowserPlugin/jni/main.cpp
@@ -157,9 +157,8 @@
 
     // Scripting functions appeared in NPAPI version 14
     if (browser->version >= 14) {
-    instance->pdata = browser->createobject (instance, getPluginClass());
-    obj = static_cast<PluginObject*>(instance->pdata);
-    bzero(obj, sizeof(*obj));
+        instance->pdata = browser->createobject (instance, getPluginClass());
+        obj = static_cast<PluginObject*>(instance->pdata);
     }
     /* END: STANDARD PLUGIN FRAMEWORK */
 
@@ -407,9 +406,9 @@
         PluginObject *obj = (PluginObject*) instance->pdata;
 
         if (obj)
-            browser->retainobject((NPObject*)obj);
+            browser->retainobject(&obj->header);
 
-        *v = obj;
+        *v = &(obj->header);
         return NPERR_NO_ERROR;
     }