/hg/release/icedtea-web-1.0: 2 new changesets

[dbhole at icedtea.classpath.org]

changeset 4169f6296ed7 in /hg/release/icedtea-web-1.0
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.0?cmd=changeset;node=4169f6296ed7
author: Deepak Bhole <dbhole at redhat.com>
date: Mon Apr 18 11:36:52 2011 -0400

	Fixed RH691259: Midori sends a SIGSEGV with the IcedTea NP Plugin


changeset 2b7512af4dcc in /hg/release/icedtea-web-1.0
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.0?cmd=changeset;node=2b7512af4dcc
author: Deepak Bhole <dbhole at redhat.com>
date: Mon Apr 18 13:16:39 2011 -0400

	Fix applet rezising issue seen with some browsers (Midori)


diffstat:

 ChangeLog                                                |  14 ++++++++
 plugin/icedteanp/IcedTeaNPPlugin.cc                      |  20 +++++++----
 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java |  26 +++++++++++++++-
 3 files changed, 51 insertions(+), 9 deletions(-)

diffs (101 lines):

diff -r 218e20b249b8 -r 2b7512af4dcc ChangeLog
--- a/ChangeLog	Thu Apr 07 18:06:40 2011 -0400
+++ b/ChangeLog	Mon Apr 18 13:16:39 2011 -0400
@@ -1,3 +1,17 @@
+2011-04-18  Deepak Bhole <dbhole at redhat.com>
+
+	* plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
+	(PluginAppletPanelFactory::createPanel): Make the NetxPanel variable
+	final. Resize frame to work around problem whereby AppletViewerPanel
+	doesn't always set the right size initially.
+
+2011-04-18  Deepak Bhole <dbhole at redhat.com>
+
+	RH691259: Midori sends a SIGSEGV with the IcedTea NP Plugin
+	* plugin/icedteanp/IcedTeaNPPlugin.cc (NP_Initialize): Rather than
+	returning immediately if already initialized, return after function tables
+	are reset.
+
 2011-04-07  Deepak Bhole <dbhole at redhat.com>
 
 	* plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
diff -r 218e20b249b8 -r 2b7512af4dcc plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc	Thu Apr 07 18:06:40 2011 -0400
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc	Mon Apr 18 13:16:39 2011 -0400
@@ -2005,14 +2005,12 @@
 {
   PLUGIN_DEBUG ("NP_Initialize\n");
 
-  if (initialized)
-    return NPERR_NO_ERROR;
-  else if ((browserTable == NULL) || (pluginTable == NULL))
-    {
-      PLUGIN_ERROR ("Browser or plugin function table is NULL.");
-
-      return NPERR_INVALID_FUNCTABLE_ERROR;
-    }
+  if ((browserTable == NULL) || (pluginTable == NULL))
+  {
+    PLUGIN_ERROR ("Browser or plugin function table is NULL.");
+
+    return NPERR_INVALID_FUNCTABLE_ERROR;
+  }
 
   // Ensure that the major version of the plugin API that the browser
   // expects is not more recent than the major version of the API that
@@ -2119,6 +2117,12 @@
   pluginTable->getvalue = NPP_GetValueProcPtr (ITNP_GetValue);
 #endif
 
+  // Re-setting the above tables multiple times is OK (as the 
+  // browser may change its function locations). However 
+  // anything beyond this point should only run once.
+  if (initialized)
+    return NPERR_NO_ERROR;
+
   // Make sure the plugin data directory exists, creating it if
   // necessary.
   data_directory = g_strconcat (P_tmpdir, NULL);
diff -r 218e20b249b8 -r 2b7512af4dcc plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
--- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java	Thu Apr 07 18:06:40 2011 -0400
+++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java	Mon Apr 18 13:16:39 2011 -0400
@@ -126,7 +126,7 @@
                                     long handle, int x, int y,
                                     final URL doc,
                                     final Hashtable<String, String> atts) {
-        AppletViewerPanel panel = AccessController.doPrivileged(new PrivilegedAction<AppletViewerPanel>() {
+        final AppletViewerPanel panel = AccessController.doPrivileged(new PrivilegedAction<AppletViewerPanel>() {
             public AppletViewerPanel run() {
                 try {
                     AppletViewerPanel panel = new NetxPanel(doc, atts, false);
@@ -192,6 +192,30 @@
         PluginDebug.debug("Applet " + a.getClass() + " initialized");
         streamhandler.write("instance " + identifier + " reference 0 initialized");
 
+        /* AppletViewerPanel sometimes doesn't set size right initially. This 
+         * causes the parent frame to be the default (10x10) size.
+         *  
+         * Normally it goes unnoticed since browsers like Firefox make a resize 
+         * call after init. However some browsers (e.g. Midori) don't.
+         * 
+         * We therefore manually set the parent to the right size.
+         */
+        try {
+            SwingUtilities.invokeAndWait(new Runnable() {
+                public void run() {
+                    panel.getParent().setSize(Integer.valueOf(atts.get("width")), Integer.valueOf(atts.get("height")));
+                }
+            });
+        } catch (InvocationTargetException ite) {
+            // Not being able to resize is non-fatal
+            PluginDebug.debug("Unable to resize panel: ");
+            ite.printStackTrace();
+        } catch (InterruptedException ie) {
+            // Not being able to resize is non-fatal
+            PluginDebug.debug("Unable to resize panel: ");
+            ie.printStackTrace();
+        }
+
         AppletSecurityContextManager.getSecurityContext(0).associateSrc(((NetxPanel) panel).getAppletClassLoader(), doc);
         AppletSecurityContextManager.getSecurityContext(0).associateInstance(identifier, ((NetxPanel) panel).getAppletClassLoader());