src/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java

*** 36,46 ****
  @SuppressWarnings("serial") // JDK implementation class
  public class CEmbeddedFrame extends EmbeddedFrame {
  
      private CPlatformResponder responder;
      private static final Object classLock = new Object();
!     private static volatile CEmbeddedFrame focusedWindow;
      private boolean parentWindowActive = true;
  
      public CEmbeddedFrame() {
          show();
      }
--- 36,47 ----
  @SuppressWarnings("serial") // JDK implementation class
  public class CEmbeddedFrame extends EmbeddedFrame {
  
      private CPlatformResponder responder;
      private static final Object classLock = new Object();
!     private static volatile CEmbeddedFrame globalFocusedWindow;
!     private CEmbeddedFrame pluginFocusedWindow;
      private boolean parentWindowActive = true;
  
      public CEmbeddedFrame() {
          show();
      }
*** 109,122 ****
      // This method can be called from different threads.
      public void handleFocusEvent(boolean focused) {
          synchronized (classLock) {
              // In some cases an applet may not receive the focus lost event
              // from the parent window (see 8012330)
!             focusedWindow = (focused) ? this
!                     : ((focusedWindow == this) ? null : focusedWindow);
          }
!         if (focusedWindow == this) {
              // see bug 8010925
              // we can't put this to handleWindowFocusEvent because
              // it won't be invoced if focuse is moved to a html element
              // on the same page.
              CClipboard clipboard = (CClipboard) Toolkit.getDefaultToolkit().getSystemClipboard();
--- 110,123 ----
      // This method can be called from different threads.
      public void handleFocusEvent(boolean focused) {
          synchronized (classLock) {
              // In some cases an applet may not receive the focus lost event
              // from the parent window (see 8012330)
!             globalFocusedWindow = (focused) ? this
!                     : ((globalFocusedWindow == this) ? null : globalFocusedWindow);
          }
!         if (globalFocusedWindow == this) {
              // see bug 8010925
              // we can't put this to handleWindowFocusEvent because
              // it won't be invoced if focuse is moved to a html element
              // on the same page.
              CClipboard clipboard = (CClipboard) Toolkit.getDefaultToolkit().getSystemClipboard();
*** 143,158 ****
      // handleWindowFocusEvent is called for all applets, when the browser
      // becomes active/inactive. This event should be filtered out for
      // non-focused applet. This method can be called from different threads.
      public void handleWindowFocusEvent(boolean parentWindowActive) {
          this.parentWindowActive = parentWindowActive;
          // ignore focus "lost" native request as it may mistakenly
          // deactivate active window (see 8001161)
!         if (focusedWindow == this && parentWindowActive) {
              responder.handleWindowFocusEvent(parentWindowActive, null);
          }
      }
  
      public boolean isParentWindowActive() {
          return parentWindowActive;
      }
  }
--- 144,179 ----
      // handleWindowFocusEvent is called for all applets, when the browser
      // becomes active/inactive. This event should be filtered out for
      // non-focused applet. This method can be called from different threads.
      public void handleWindowFocusEvent(boolean parentWindowActive) {
          this.parentWindowActive = parentWindowActive;
+         // If several applets are running in different browser's windows, it is necessary to
+         // detect the switching between the parent windows and update globalFocusedWindow accordingly.
+         synchronized (classLock) {
+             if (!parentWindowActive) {
+                 this.pluginFocusedWindow = globalFocusedWindow;
+             }
+             if (parentWindowActive && globalFocusedWindow != this && isParentWindowChanged()) {
+                 // It looks like we have switched to another browser window, let's restore focus to
+                 // the previously focused applet in this window. If no applets were focused in the
+                 // window, we will set focus to the first applet in the window.
+                 globalFocusedWindow = (this.pluginFocusedWindow != null) ? this.pluginFocusedWindow
+                         : this;
+             }
+         }
          // ignore focus "lost" native request as it may mistakenly
          // deactivate active window (see 8001161)
!         if (globalFocusedWindow == this && parentWindowActive) {
              responder.handleWindowFocusEvent(parentWindowActive, null);
          }
      }
  
      public boolean isParentWindowActive() {
          return parentWindowActive;
      }
+ 
+     private boolean isParentWindowChanged() {
+         // If globalFocusedWindow is located at inactive parent window or null, we have swithed to
+         // another window.
+         return globalFocusedWindow != null ? !globalFocusedWindow.isParentWindowActive() : true;
+     }
  }