Changeset 429 for trunk/icedtea-web/plugin/icedteanp/IcedTeaNPPlugin.h

Timestamp:

Sep 24, 2014, 9:34:21 PM (11 years ago)

Author:

dmik

Message:

icedtea-web: Merge version 1.5.1 from vendor to trunk.

File:

• trunk/icedtea-web/plugin/icedteanp/IcedTeaNPPlugin.h (modified) (6 diffs)

trunk/icedtea-web/plugin/icedteanp/IcedTeaNPPlugin.h

@@ -40 +40 @@
 #define __ICEDTEANPPLUGIN_H__
 
-#if MOZILLA_VERSION_COLLAPSED < 1090100
-#include <nsThreadUtils.h>
-#else
 #include <npapi.h>
 #include <npruntime.h>
 #include <npfunctions.h>
-#endif
 
 // GLib includes.
 #include <glib.h>
 #include <glib/gstdio.h>
-
-#ifndef __OS2__
-// GTK includes.
-#include <gtk/gtk.h>
-#endif
 
 #include "IcedTeaPluginUtils.h"
@@ -69 +60 @@
   // A unique identifier for this plugin window.
   gchar* instance_id;
-  // The applet tag sent to Java side
-  gchar* applet_tag;
+  // The parameter list string sent to Java side
+  gchar* parameters_string;
   // Mutex to protect appletviewer_alive.
   GMutex* appletviewer_mutex;
@@ -84 +75 @@
   guint32 window_height;
   // The source location for this instance
-  gchar* source;
+  std::string source;
   // If this is an actual applet instance, or a dummy instance for static calls
   bool is_applet_instance;
+
+  ITNPPluginData() {
+      instance_id = NULL;
+      parameters_string = NULL;
+      appletviewer_mutex = NULL;
+      owner = (NPP)NULL;
+      window_handle = NULL;
+      window_width = 0;
+      window_height = 0;
+      is_applet_instance = false;
+  }
+  ~ITNPPluginData() {
+      if (appletviewer_mutex) {
+        g_mutex_free (appletviewer_mutex);
+      }
+      // cleanup_instance_string:
+      g_free (instance_id);
+      // cleanup applet tag
+      g_free (parameters_string);
+  }
 };
 
-// Queue processing threads
-static pthread_t plugin_request_processor_thread1;
-static pthread_t plugin_request_processor_thread2;
-static pthread_t plugin_request_processor_thread3;
+// Have the browser allocate a new ITNPPluginData structure.
+ITNPPluginData* plugin_data_new ();
+void plugin_data_destroy (NPP instance);
 
-#ifdef __OS2__
-struct QueueProcessorData
-{
-    PluginRequestProcessor *processor;
-    bool stopRequested;
-};
-
-static QueueProcessorData queue_processor_data1 = { NULL, false };
-static QueueProcessorData queue_processor_data2 = { NULL, false };
-static QueueProcessorData queue_processor_data3 = { NULL, false };
-#endif
-
-// Condition on which the queue processor waits
-extern pthread_cond_t cond_message_available;
+NPError initialize_data_directory();
+NPError start_jvm_if_needed();
 
 // ID of plug-in thread
@@ -115 +113 @@
 extern pthread_mutex_t pluginAsyncCallMutex;
 
-// debug switch
+/*to sync pipe to apletviewer console*/
+extern pthread_mutex_t debug_pipe_lock;
+
+// debug switches
+extern bool debug_initiated;
 extern int plugin_debug;
+extern bool plugin_debug_headers;
+extern bool plugin_debug_to_file;
+extern bool plugin_debug_to_streams;
+extern bool plugin_debug_to_system;
+extern bool plugin_debug_to_console;
+extern FILE * plugin_file_log;
+extern std::string plugin_file_log_name;
+extern gchar* debug_pipe_name;
+
+extern gboolean jvm_up;
 
 // Browser function table.
@@ -144 +156 @@
 /* Sends a message to the appletviewer */
 void plugin_send_message_to_appletviewer(gchar const* message);
+/*this method is not logging, do not add \n and is using different pipe*/
+void plugin_send_message_to_appletviewer_console(gchar const* message);
+void flush_plugin_send_message_to_appletviewer_console();
 
 /* Returns an appropriate (package/object) scriptable npobject */
@@ -151 +166 @@
 NPObject* allocate_scriptable_object(NPP npp, NPClass *aClass);
 
+NPError plugin_start_appletviewer (ITNPPluginData* data);
+
 #endif  /* __ICEDTEANPPLUGIN_H__ */