[icedtea-web] RFC: Patches to make the plugin work with Midori

[Deepak Bhole]

Oops, forgot to attach the patches. Attached now.

Deepak

* Deepak Bhole <dbhole at redhat.com> [2011-04-15 18:57]:
> Hi,
> 
> Midori currently segfaults with the icedtea-web plugin in F15[1]. Attached
> (first) patch fixes the issue.
> 
> I discovered an additional issue later related to applet sizing (that I
> have seen only with Midori so far). Attached (second) patch fixes that
> issue. The comments in the patch explain why the change is needed.
> 
> 1: https://bugzilla.redhat.com/show_bug.cgi?id=691259
> 
> ChangeLogs:
> 2011-04-15  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-15  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.
> 
> 
> Okay for 1.0 (F15 has 1.0.x) and HEAD?
> 
> Cheers,
> Deepak
-------------- next part --------------
diff -r b4db997469a2 plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc	Thu Apr 14 21:41:32 2011 +0100
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc	Fri Apr 15 18:44:06 2011 -0400
@@ -2009,14 +2009,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
@@ -2123,6 +2121,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);
-------------- next part --------------
diff -r b4db997469a2 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
--- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java	Thu Apr 14 21:41:32 2011 +0100
+++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java	Fri Apr 15 18:44:06 2011 -0400
@@ -122,7 +122,7 @@
                                     long handle, int x, int y,
                                     final URL doc,
                                     final Hashtable<String, String> atts) {
-        NetxPanel panel = AccessController.doPrivileged(new PrivilegedAction<NetxPanel>() {
+        final NetxPanel panel = AccessController.doPrivileged(new PrivilegedAction<NetxPanel>() {
             public NetxPanel run() {
                 NetxPanel panel = new NetxPanel(doc, atts, false);
                 NetxPanel.debug("Using NetX panel");
@@ -171,6 +171,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(panel.getAppletClassLoader(), doc);
         AppletSecurityContextManager.getSecurityContext(0).associateInstance(identifier, panel.getAppletClassLoader());