[icedtea-web] RFC: Patch to remove plugin re-framing

[Deepak Bhole]

Hi,

Attached patch changes the plugin so that the panel is Framed only once.
This patch permanently resolves the frame pop-out issue.

The reFrame method has been updated and renamed to framePanel.
framePanel is called only once during initialization now, and there is
no more frame swapping. This also resolves the issue whereby keyboard
events were being discarded.

ChangeLog:
2010-11-04  Deepak Bhole <dbhole at redhat.com>

   * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
   (createPanel): Call the new framePanel() method with the proper handle.
   (framePanel): New method, renamed from reFrame. Changed to now do one-time
   framing of panel into the plugin.
   (handleMessage): Don't re-frame the panel. Panel is now framed only once.
   (destroyApplet): Dispose the frame right away, and try to remove the panel
   if possible. If not, handleMessage() will do it when the panel is 
   ready/removable.

Comments?

Deepak
-------------- next part --------------
diff -r 6c2527d42900 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
--- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java	Mon Nov 01 11:44:15 2010 -0400
+++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java	Thu Nov 04 16:23:48 2010 -0700
@@ -138,7 +138,7 @@
          });
          
          // create the frame.
-         PluginAppletViewer.reFrame(null, identifier, System.out, 0, panel);
+         PluginAppletViewer.framePanel(identifier, System.out, handle, panel);
 
          panel.init();
 
@@ -365,42 +365,25 @@
      public PluginAppletViewer() {
      }
 
-     public static void reFrame(PluginAppletViewer oldFrame, 
-                         int identifier, PrintStream statusMsgStream, 
-                         long handle, AppletViewerPanel panel) {
+     public static void framePanel(int identifier, PrintStream statusMsgStream, 
+                         	  long handle, AppletViewerPanel panel) {
 
-         PluginDebug.debug("Reframing " + panel);
+         PluginDebug.debug("Framing " + panel);
          
          // SecurityManager MUST be set, and only privileged code may call reFrame()
          System.getSecurityManager().checkPermission(new AllPermission());
 
-         // Same handle => nothing to do
-         if (oldFrame != null && handle == oldFrame.handle)
-             return;
+         PluginAppletViewer appletFrame = new PluginAppletViewer(handle, identifier, statusMsgStream, panel);
+         
+         appletFrame.add("Center", panel);
+         appletFrame.pack();
 
-         PluginAppletViewer newFrame = new PluginAppletViewer(handle, identifier, statusMsgStream, panel);
-         
-         if (oldFrame != null) {
-             applets.remove(oldFrame.identifier);
-             oldFrame.removeWindowListener(oldFrame.windowEventListener);
-             panel.removeAppletListener(oldFrame.appletEventListener);
+         appletFrame.appletEventListener = new AppletEventListener(appletFrame, appletFrame);
+         panel.addAppletListener(appletFrame.appletEventListener);
 
-			 // Add first, remove later
-             newFrame.add("Center", panel);
-             oldFrame.remove(panel);
-             oldFrame.dispose();
-         } else {
-	         newFrame.add("Center", panel);
-         }
+         applets.put(identifier, appletFrame);
 
-         newFrame.pack();
-
-         newFrame.appletEventListener = new AppletEventListener(newFrame, newFrame);
-         panel.addAppletListener(newFrame.appletEventListener);
-
-         applets.put(identifier, newFrame);
-
-         PluginDebug.debug(panel + " reframed");
+         PluginDebug.debug(panel + " framed");
      }
 
      /**
@@ -578,20 +561,11 @@
                  waitForAppletInit((NetxPanel) applets.get(identifier).panel);
 
                  // Should we proceed with reframing?
-                 if (status.get(identifier).equals(PAV_INIT_STATUS.INACTIVE)) {
+                 if (updateStatus(identifier, PAV_INIT_STATUS.REFRAME_COMPLETE).equals(PAV_INIT_STATUS.INACTIVE)) {
                      destroyApplet(identifier);
                      return;
                  }
 
-                 // Proceed with re-framing
-          		 reFrame(oldFrame, identifier, System.out, handle, oldFrame.panel);
-
-                 // There is a slight chance that destroy can happen 
-                 // between the above and below line
-                 if (updateStatus(identifier, PAV_INIT_STATUS.REFRAME_COMPLETE).equals(PAV_INIT_STATUS.INACTIVE)) {
-                     destroyApplet(identifier);
-                 }
-
              } else if (message.startsWith("destroy")) {
 
             	 // Set it inactive, and try to do cleanup is applicable
@@ -688,16 +662,19 @@
     		 return;
     	 }
 
-    	 // If already disposed, return
-    	 if (applets.get(identifier).panel.applet == null) {
-    		 // Try to still dispose the panel itself -- no harm done with double dispose
+    	 PluginDebug.debug("Attempting to destroy frame " + identifier);
+    	 
+    	 // Try to dispose the panel right away
+    	 if (applets.containsKey(identifier)) 
     		 applets.get(identifier).dispose();
 
-    		 PluginDebug.debug(identifier + " inactive. Returning.");
+    	 // If panel is already disposed, return
+    	 if (applets.get(identifier).panel.applet == null) {
+    		 PluginDebug.debug(identifier + " panel inactive. Returning.");
     		 return;
     	 }
 
-    	 PluginDebug.debug("Attempting to destroy " + identifier);
+    	 PluginDebug.debug("Attempting to destroy panel " + identifier);
 
     	 final int fIdentifier = identifier;
    		 SwingUtilities.invokeLater(new Runnable() {
@@ -1671,7 +1648,7 @@
              public void run()
              {
                  ThreadGroup tg = ((JNLPClassLoader) p.applet.getClass().getClassLoader()).getApplication().getThreadGroup();
-                
+
                  appletShutdown(p);
                  appletPanels.removeElement(p);
                  dispose();