/hg/icedtea6: Added support for JSObject.finalize()

[dbhole at icedtea.classpath.org]

changeset 6b7bf9f691c9 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6b7bf9f691c9
author: Deepak Bhole <dbhole at redhat.com>
date: Tue Mar 16 10:29:49 2010 -0400

	Added support for JSObject.finalize()


diffstat:

3 files changed, 66 insertions(+), 9 deletions(-)
ChangeLog                                         |    9 +++
plugin/icedteanp/IcedTeaPluginRequestProcessor.cc |   56 ++++++++++++++++++++-
plugin/icedteanp/IcedTeaPluginRequestProcessor.h  |   10 ---

diffs (123 lines):

diff -r 388bb89496bc -r 6b7bf9f691c9 ChangeLog
--- a/ChangeLog	Mon Mar 15 22:01:12 2010 +0000
+++ b/ChangeLog	Tue Mar 16 10:29:49 2010 -0400
@@ -1,3 +1,12 @@ 2010-03-15  Andrew John Hughes  <ahughes
+2010-03-16  Deepak Bhole <dbhole at redhat.com>
+
+	* plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
+	(newMessageOnBus): Added support for finalize.
+	(finalize): New function. Decrements object reference count by one.
+	(queue_processor): Added support for finalize.
+	* plugin/icedteanp/IcedTeaPluginRequestProcessor.h: Removed unused
+	function declerations. Added decleration for finalize.
+
 2010-03-15  Andrew John Hughes  <ahughes at redhat.com>
 
 	NetX/plugin build sync (2/3):
diff -r 388bb89496bc -r 6b7bf9f691c9 plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
--- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc	Mon Mar 15 22:01:12 2010 +0000
+++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc	Tue Mar 16 10:29:49 2010 -0400
@@ -119,7 +119,8 @@ PluginRequestProcessor::newMessageOnBus(
                    command == "Call"      ||
                    command == "GetSlot"   ||
                    command == "SetSlot"   ||
-                   command == "Eval")
+                   command == "Eval"      ||
+                   command == "Finalize")
         {
 
             // Update queue synchronously
@@ -665,6 +666,53 @@ PluginRequestProcessor::sendMember(std::
     pthread_mutex_unlock(&tc_mutex);
 }
 
+/**
+ * Decrements reference count to given object
+ *
+ * @param message_parts The request message.
+ */
+
+void
+PluginRequestProcessor::finalize(std::vector<std::string>* message_parts)
+{
+    std::string type;
+    std::string command;
+    int reference;
+    std::string response = std::string();
+    std::string variant_ptr_str = std::string();
+    NPVariant* variant_ptr;
+    NPObject* window_ptr;
+    int id;
+
+    type = message_parts->at(0);
+    id = atoi(message_parts->at(1).c_str());
+    reference = atoi(message_parts->at(3).c_str());
+    variant_ptr_str = message_parts->at(5);
+
+    NPP instance;
+    get_instance_from_id(id, instance);
+
+    variant_ptr = (NPVariant*) IcedTeaPluginUtilities::stringToJSID(variant_ptr_str);
+    window_ptr = NPVARIANT_TO_OBJECT(*variant_ptr);
+    browser_functions.releaseobject(window_ptr);
+
+    // remove reference
+    IcedTeaPluginUtilities::removeInstanceID(variant_ptr);
+
+    // clear memory
+    free(variant_ptr);
+
+    // We need the context 0 for backwards compatibility with the Java side
+    IcedTeaPluginUtilities::constructMessagePrefix(0, reference, &response);
+    response += " JavaScriptFinalize";
+
+    plugin_to_java_bus->post(response.c_str());
+
+    delete message_parts;
+
+}
+
+
 void*
 queue_processor(void* data)
 {
@@ -725,6 +773,12 @@ queue_processor(void* data)
                 // write methods are synchronized
                 pthread_mutex_lock(&syn_write_mutex);
                 processor->setMember(message_parts);
+                pthread_mutex_unlock(&syn_write_mutex);
+            } else if (command == "Finalize")
+            {
+                // write methods are synchronized
+                pthread_mutex_lock(&syn_write_mutex);
+                processor->finalize(message_parts);
                 pthread_mutex_unlock(&syn_write_mutex);
             } else
             {
diff -r 388bb89496bc -r 6b7bf9f691c9 plugin/icedteanp/IcedTeaPluginRequestProcessor.h
--- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.h	Mon Mar 15 22:01:12 2010 +0000
+++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.h	Tue Mar 16 10:29:49 2010 -0400
@@ -72,14 +72,6 @@ typedef struct async_call_thread_data
 /* Internal request reference counter */
 static long internal_req_ref_counter;
 
-// JS request processor methods
-static void* requestFromMainThread();
-static void* getSlot(void* tdata);
-static void* setSlot(void* tdata);
-static void* removeMember(void* tdata);
-static void* call(void* tdata);
-static void* finalize(void* tdata);
-
 /* Given a value and type, performs the appropriate Java->JS type
  * mapping and puts it in the given variant */
 
@@ -147,6 +139,8 @@ class PluginRequestProcessor : public Bu
         /* Evaluate the given script */
         void call(std::vector<std::string>* message_parts);
 
+        /* Decrements reference count for given object */
+        void finalize(std::vector<std::string>* message_parts);
 };
 
 #endif // __ICEDTEAPLUGINREQUESTPROCESSOR_H__