changeset 120:98296a9fc072

6603010: Out-of-process Java Plug-In non-functional or barely functional on X11 platforms Summary: AWT XEmbed shouldn't use _SUN_XEMBED_START message Reviewed-by: art, son
author dcherepanov
date Fri, 14 Mar 2008 18:50:02 +0300
parents c4ce9d68f58e
children c43b2dfab9ac
files jdk/src/solaris/classes/sun/awt/X11/XEmbedCanvasPeer.java jdk/src/solaris/classes/sun/awt/X11/XEmbedClientHelper.java jdk/src/solaris/classes/sun/awt/X11/XEmbedHelper.java jdk/src/solaris/classes/sun/awt/X11/XEmbedServerTester.java
diffstat 4 files changed, 0 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/src/solaris/classes/sun/awt/X11/XEmbedCanvasPeer.java	Fri Mar 14 18:27:34 2008 +0300
+++ b/jdk/src/solaris/classes/sun/awt/X11/XEmbedCanvasPeer.java	Fri Mar 14 18:50:02 2008 +0300
@@ -647,12 +647,6 @@
         }
         if (isXEmbedActive()) {
             switch ((int)msg.get_data(1)) {
-              case _SUN_XEMBED_START:
-                  // Child has finished initialization and waits for notify
-                  xembed.processXEmbedInfo();
-
-                  notifyChildEmbedded();
-                  break;
               case XEMBED_REQUEST_FOCUS:
                   requestXEmbedFocus();
                   break;
--- a/jdk/src/solaris/classes/sun/awt/X11/XEmbedClientHelper.java	Fri Mar 14 18:27:34 2008 +0300
+++ b/jdk/src/solaris/classes/sun/awt/X11/XEmbedClientHelper.java	Fri Mar 14 18:50:02 2008 +0300
@@ -74,7 +74,6 @@
                 XToolkit.awtUnlock();
             }
         }
-        notifyReady();
     }
 
     void handleClientMessage(XEvent xev) {
@@ -84,7 +83,6 @@
             if (xembedLog.isLoggable(Level.FINE)) xembedLog.fine("Embedded message: " + msgidToString((int)msg.get_data(1)));
             switch ((int)msg.get_data(1)) {
               case XEMBED_EMBEDDED_NOTIFY: // Notification about embedding protocol start
-                  // NOTE: May be called two times because we send _SUN_XEMBED_START
                   active = true;
                   server = getEmbedder(embedded, msg);
                   // Check if window is reparented. If not - it was created with
@@ -223,13 +221,4 @@
     long getX11Mods(AWTKeyStroke stroke) {
         return XWindow.getXModifiers(stroke);
     }
-
-    void notifyReady() {
-        long wnd = server;
-        if (wnd == 0) {
-            // Server is still 0, get the parent
-            wnd = embedded.getParentWindowHandle();
-        }
-        sendMessage(wnd, _SUN_XEMBED_START);
-    }
 }
--- a/jdk/src/solaris/classes/sun/awt/X11/XEmbedHelper.java	Fri Mar 14 18:27:34 2008 +0300
+++ b/jdk/src/solaris/classes/sun/awt/X11/XEmbedHelper.java	Fri Mar 14 18:50:02 2008 +0300
@@ -58,7 +58,6 @@
     final static int XEMBED_REGISTER_ACCELERATOR =    12;
     final static int XEMBED_UNREGISTER_ACCELERATOR=   13;
     final static int XEMBED_ACTIVATE_ACCELERATOR  =   14;
-    final static int _SUN_XEMBED_START = 1119;
 
     final static int NON_STANDARD_XEMBED_GTK_GRAB_KEY = 108;
     final static int NON_STANDARD_XEMBED_GTK_UNGRAB_KEY = 109;
@@ -151,8 +150,6 @@
               return "NON_STANDARD_XEMBED_GTK_UNGRAB_KEY";
           case NON_STANDARD_XEMBED_GTK_GRAB_KEY:
               return "NON_STANDARD_XEMBED_GTK_GRAB_KEY";
-          case _SUN_XEMBED_START:
-              return "XEMBED_START";
           case XConstants.KeyPress | XEmbedServerTester.SYSTEM_EVENT_MASK:
               return "KeyPress";
           case XConstants.MapNotify | XEmbedServerTester.SYSTEM_EVENT_MASK:
--- a/jdk/src/solaris/classes/sun/awt/X11/XEmbedServerTester.java	Fri Mar 14 18:27:34 2008 +0300
+++ b/jdk/src/solaris/classes/sun/awt/X11/XEmbedServerTester.java	Fri Mar 14 18:50:02 2008 +0300
@@ -177,13 +177,6 @@
         embedCompletely();
     }
 
-    public void test3_2() {
-        embedCompletely();
-        int res = getEventPos();
-        sendMessage(XEmbedHelper._SUN_XEMBED_START);
-        waitEmbeddedNotify(res);
-    }
-
     public void test3_3() {
         reparent = true;
         embedCompletely();