updated JTreg exclude list

cherry-picked from a8c7db34

(cherry picked from commit bd9a95d6fb)

.gitignore

@@ -2,4 +2,3 @@ JTwork
 JTreport
 *.class
 .idea/workspace.xml
-build/

jb/project/java-common.cmake

@@ -1,30 +0,0 @@
-# common for all OS
-set(CMAKE_CXX_STANDARD 98)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE -D_REENTRANT -DVM_LITTLE_ENDIAN -D_LP64 -DTARGET_ARCH_x86 ")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DINCLUDE_SUFFIX_CPU=_x86 -DAMD64 -DHOTSPOT_LIB_ARCH='amd64' -DCOMPILER1 -DCOMPILER2")
-
-if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR ${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTARGET_COMPILER_gcc")
-endif ()
-
-if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DLINUX -DTARGET_OS_FAMILY_linux -DTARGET_COMPILER_gcc -D_GNU_SOURCE")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DLINUX -DTARGET_OS_FAMILY_linux -DTARGET_COMPILER_gcc -D_GNU_SOURCE")
-endif ()
-
-if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_ALLBSD_SOURCE -DTARGET_OS_FAMILY_bsd")
-endif ()
-
-if ("${CMAKE_SYSTEM_NAME}" MATCHES "CYGWIN") #not shure about TARGET_COMPILER
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTARGET_COMPILER_visCPP -DWIN64 -D_WINDOWS -DTARGET_OS_FAMILY_windows")
-endif ()
-
-add_custom_target(configure
-        COMMAND bash configure
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/../../../)
-
-add_custom_target(build_images
-        COMMAND make COMPILER_WARNINGS_FATAL=false images
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/../../../
-        DEPENDS ${SOURCE_FILES})

make/lib/Awt2dLibraries.gmk

@@ -252,7 +252,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \
     LIBS_windows := kernel32.lib user32.lib gdi32.lib winspool.lib \
         imm32.lib ole32.lib uuid.lib shell32.lib \
         comdlg32.lib winmm.lib comctl32.lib shlwapi.lib \
-        delayimp.lib jvm.lib $(WIN_JAVA_LIB) advapi32.lib, \
+        delayimp.lib jvm.lib $(WIN_JAVA_LIB) advapi32.lib dwmapi.lib, \
     VERSIONINFO_RESOURCE := $(LIBAWT_VERSIONINFO_RESOURCE), \
     RC_FLAGS := $(RC_FLAGS) $(LIBAWT_RC_FLAGS) \
         -D "JDK_FNAME=awt.dll" \

modules.list

@@ -30,6 +30,7 @@ javafx.web,
 jdk.accessibility,
 jdk.aot,
 jdk.charsets,
+jdk.compiler,
 jdk.crypto.cryptoki,
 jdk.crypto.ec,
 jdk.dynalink,

src/java.desktop/macosx/classes/sun/lwawt/LWComponentPeer.java

@@ -957,24 +957,17 @@ public abstract class LWComponentPeer<T extends Component, D extends JComponent>
                     }
                 }
 
-                boolean res = parentPeer.requestWindowFocus(cause);
-                // If parent window can be made focused and has been made focused (synchronously)
-                // then we can proceed with children, otherwise we retreat
-                if (!res || !parentWindow.isFocused()) {
-                    if (focusLog.isLoggable(PlatformLogger.Level.FINE)) {
-                        focusLog.fine("request rejected, res= " + res + ", parentWindow.isFocused()=" +
-                                      parentWindow.isFocused());
-                    }
+                return parentPeer.requestWindowFocus(cause, () -> {
                     LWKeyboardFocusManagerPeer.removeLastFocusRequest(getTarget());
-                    return false;
-                }
+                }, () -> {
+                    KeyboardFocusManagerPeer kfmPeer = LWKeyboardFocusManagerPeer.getInstance();
 
-                KeyboardFocusManagerPeer kfmPeer = LWKeyboardFocusManagerPeer.getInstance();
-                Component focusOwner = kfmPeer.getCurrentFocusOwner();
-                return LWKeyboardFocusManagerPeer.deliverFocus(lightweightChild,
-                        getTarget(), temporary,
-                        focusedWindowChangeAllowed,
-                        time, cause, focusOwner);
+                    Component focusOwner = kfmPeer.getCurrentFocusOwner();
+                    LWKeyboardFocusManagerPeer.deliverFocus(lightweightChild,
+                            getTarget(), temporary,
+                            focusedWindowChangeAllowed,
+                            time, cause, focusOwner);
+                });
 
             case LWKeyboardFocusManagerPeer.SNFH_SUCCESS_HANDLED:
                 return true;

src/java.desktop/macosx/classes/sun/lwawt/LWLightweightFramePeer.java

@@ -61,18 +61,18 @@ public class LWLightweightFramePeer extends LWWindowPeer implements OverrideNati
     }
 
     @Override
-    public boolean requestWindowFocus(FocusEvent.Cause cause) {
+    public boolean requestWindowFocus(FocusEvent.Cause cause, Runnable r,  Runnable lightweightRequest) {
         if (!focusAllowedFor()) {
             return false;
         }
-        if (getPlatformWindow().rejectFocusRequest(cause)) {
+        /*if (getPlatformWindow().rejectFocusRequest(cause)) {
             return false;
-        }
+        }*/
 
         Window opposite = LWKeyboardFocusManagerPeer.getInstance().
             getCurrentFocusedWindow();
 
-        changeFocusedWindow(true, opposite);
+        changeFocusedWindow(true, opposite, () -> {});
 
         return true;
     }

src/java.desktop/macosx/classes/sun/lwawt/LWWindowPeer.java

@@ -61,16 +61,8 @@ import java.util.List;
 
 import javax.swing.JComponent;
 
-import sun.awt.AWTAccessor;
+import sun.awt.*;
 import sun.awt.AWTAccessor.ComponentAccessor;
-import sun.awt.AppContext;
-import sun.awt.CGraphicsDevice;
-import sun.awt.DisplayChangedListener;
-import sun.awt.ExtendedKeyCodes;
-import sun.awt.FullScreenCapable;
-import sun.awt.SunToolkit;
-import sun.awt.TimedWindowEvent;
-import sun.awt.UngrabEvent;
 import sun.java2d.NullSurfaceData;
 import sun.java2d.SunGraphics2D;
 import sun.java2d.SunGraphicsEnvironment;
@@ -297,14 +289,24 @@ public class LWWindowPeer
                 if (!getTarget().isAutoRequestFocus()) {
                     return;
                 } else {
-                    requestWindowFocus(FocusEvent.Cause.ACTIVATION);
+                    requestWindowFocus(FocusEvent.Cause.ACTIVATION, () -> {}, () -> {});
                 }
             // Focus the owner in case this window is focused.
             } else if (kfmPeer.getCurrentFocusedWindow() == getTarget()) {
                 // Transfer focus to the owner.
-                LWWindowPeer owner = getOwnerFrameDialog(LWWindowPeer.this);
-                if (owner != null) {
-                    owner.requestWindowFocus(FocusEvent.Cause.ACTIVATION);
+                Window targetOwner = LWWindowPeer.this.getTarget().getOwner();
+
+                while (targetOwner != null && (targetOwner.getOwner() != null && !targetOwner.isFocusableWindow())) {
+                    targetOwner = targetOwner.getOwner();
+                }
+
+                if (targetOwner != null) {
+
+                    LWWindowPeer owner = (LWWindowPeer) AWTAccessor.getComponentAccessor().getPeer(targetOwner);
+
+                    if (owner != null) {
+                        owner.requestWindowFocus(FocusEvent.Cause.ACTIVATION, () -> {}, () -> {});
+                    }
                 }
             }
         }
@@ -781,7 +783,7 @@ public class LWWindowPeer
     @Override
     public void notifyActivation(boolean activation, LWWindowPeer opposite) {
         Window oppositeWindow = (opposite == null)? null : opposite.getTarget();
-        changeFocusedWindow(activation, oppositeWindow);
+        changeFocusedWindow(activation, oppositeWindow, () -> {});
     }
 
     // MouseDown in non-client area
@@ -898,7 +900,7 @@ public class LWWindowPeer
                 // 2. An active but not focused owner frame/dialog is clicked.
                 // The mouse event then will trigger a focus request "in window" to the component, so the window
                 // should gain focus before.
-                requestWindowFocus(FocusEvent.Cause.MOUSE_EVENT);
+                requestWindowFocus(FocusEvent.Cause.MOUSE_EVENT, () -> {}, () -> {});
 
                 mouseDownTarget[targetIdx] = targetPeer;
             } else if (id == MouseEvent.MOUSE_DRAGGED) {
@@ -1249,19 +1251,20 @@ public class LWWindowPeer
      * Requests platform to set native focus on a frame/dialog.
      * In case of a simple window, triggers appropriate java focus change.
      */
-    public boolean requestWindowFocus(FocusEvent.Cause cause) {
+    public boolean requestWindowFocus(FocusEvent.Cause cause, Runnable rejectFocusRequest, Runnable lightweightRequest) {
         if (focusLog.isLoggable(PlatformLogger.Level.FINE)) {
             focusLog.fine("requesting native focus to " + this);
         }
 
         if (!focusAllowedFor()) {
             focusLog.fine("focus is not allowed");
+            rejectFocusRequest.run();
             return false;
         }
 
-        if (platformWindow.rejectFocusRequest(cause)) {
-            return false;
-        }
+//        if (platformWindow.rejectFocusRequest(cause)) {
+//            return false;
+//        }
 
         AppContext targetAppContext = AWTAccessor.getComponentAccessor().getAppContext(getTarget());
         KeyboardFocusManager kfm = AWTAccessor.getKeyboardFocusManagerAccessor()
@@ -1299,18 +1302,24 @@ public class LWWindowPeer
             }
 
             // DKFM will synthesize all the focus/activation events correctly.
-            changeFocusedWindow(true, opposite);
+            changeFocusedWindow(true, opposite, lightweightRequest);
             return true;
 
         // In case the toplevel is active but not focused, change focus directly,
         // as requesting native focus on it will not have effect.
         } else if (getTarget() == currentActive && !getTarget().hasFocus()) {
-
-            changeFocusedWindow(true, opposite);
+            changeFocusedWindow(true, opposite, lightweightRequest);
             return true;
         }
 
-        return platformWindow.requestWindowFocus();
+        focusLog.fine("platformWindow.requestWindowFocus()");
+        boolean requestFocusResult  = platformWindow.requestWindowFocus();
+
+        if (requestFocusResult) {
+            lightweightRequest.run();
+            return true;
+        }
+        return false;
     }
 
     protected boolean focusAllowedFor() {
@@ -1338,7 +1347,7 @@ public class LWWindowPeer
 
     @Override
     public void emulateActivation(boolean activate) {
-        changeFocusedWindow(activate, null);
+        changeFocusedWindow(activate, null, () -> {});
     }
 
     @SuppressWarnings("deprecation")
@@ -1357,7 +1366,7 @@ public class LWWindowPeer
     /*
      * Changes focused window on java level.
      */
-    protected void changeFocusedWindow(boolean becomesFocused, Window opposite) {
+    protected void changeFocusedWindow(boolean becomesFocused, Window opposite, Runnable lightweightRequestRunnable) {
         if (focusLog.isLoggable(PlatformLogger.Level.FINE)) {
             focusLog.fine((becomesFocused?"gaining":"loosing") + " focus window: " + this);
         }
@@ -1395,19 +1404,22 @@ public class LWWindowPeer
         }
 
         KeyboardFocusManagerPeer kfmPeer = LWKeyboardFocusManagerPeer.getInstance();
-
-        if (!becomesFocused && kfmPeer.getCurrentFocusedWindow() != getTarget()) {
-            // late window focus lost event - ingoring
-            return;
-        }
-
         kfmPeer.setCurrentFocusedWindow(becomesFocused ? getTarget() : null);
 
         int eventID = becomesFocused ? WindowEvent.WINDOW_GAINED_FOCUS : WindowEvent.WINDOW_LOST_FOCUS;
         WindowEvent windowEvent = new TimedWindowEvent(getTarget(), eventID, opposite, System.currentTimeMillis());
 
+        SunToolkit.setSystemGenerated(windowEvent);
+        AWTAccessor.getAWTEventAccessor().setPosted(windowEvent);
+        PeerEvent pe = new PeerEvent(getTarget(), () -> {
+            ((Component)windowEvent.getSource()).dispatchEvent(windowEvent);
+            if (becomesFocused) {
+                lightweightRequestRunnable.run();
+            }
+        }, PeerEvent.ULTIMATE_PRIORITY_EVENT);
+
         // TODO: wrap in SequencedEvent
-        postEvent(windowEvent);
+        postEvent(pe);
     }
 
     /*
@@ -1515,4 +1527,4 @@ public class LWWindowPeer
     public String toString() {
         return super.toString() + " [target is " + getTarget() + "]";
     }
-}
+}

src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java

@@ -325,9 +325,9 @@ final class CPlatformResponder {
 
         if (isISOControl) {
             characterToSendWithTheEvent = checkedChar;
-       }
-
-       characterToSendWithTheEvent = mapNsCharsToCompatibleWithJava(characterToSendWithTheEvent);
+        } else {
+            characterToSendWithTheEvent = mapNsCharsToCompatibleWithJava(characterToSendWithTheEvent);
+        }
 
        String stringWithChar = NSEvent.nsToJavaChar(characterToSendWithTheEvent, nsEvent.getModifierFlags(), spaceKeyTyped);
        characterToSendWithTheEvent = stringWithChar == null ? KeyEvent.CHAR_UNDEFINED : stringWithChar.charAt(0);

src/java.desktop/macosx/native/libawt_lwawt/awt/AWTEvent.m

@@ -241,8 +241,6 @@ static const struct CharToVKEntry charToDeadVKTable[] = {
     {0,0}
 };
 
-static BOOL RIGHT_ALT_AS_ALT_GRAPH = YES; // to provide ability to switch off the AltGr mapping if needed
-
 // TODO: some constants below are part of CGS (private interfaces)...
 // for now we will look at the raw key code to determine left/right status
 // but not sure this is foolproof...
@@ -253,20 +251,16 @@ static struct _nsKeyToJavaModifier
     //NSUInteger cgsRightMask;
     unsigned short leftKeyCode;
     unsigned short rightKeyCode;
-    BOOL leftKeyPressed;
-    BOOL rightKeyPressed;
     jint javaExtMask;
     jint javaMask;
     jint javaKey;
 }
-nsKeyToJavaModifierTable[] =
+const nsKeyToJavaModifierTable[] =
 {
     {
         NSAlphaShiftKeyMask,
         0,
         0,
-        NO,
-        NO,
         0, // no Java equivalent
         0, // no Java equivalent
         java_awt_event_KeyEvent_VK_CAPS_LOCK
@@ -277,8 +271,6 @@ nsKeyToJavaModifierTable[] =
         //kCGSFlagsMaskAppleRightShiftKey,
         56,
         60,
-        NO,
-        NO,
         java_awt_event_InputEvent_SHIFT_DOWN_MASK,
         java_awt_event_InputEvent_SHIFT_MASK,
         java_awt_event_KeyEvent_VK_SHIFT
@@ -289,8 +281,6 @@ nsKeyToJavaModifierTable[] =
         //kCGSFlagsMaskAppleRightControlKey,
         59,
         62,
-        NO,
-        NO,
         java_awt_event_InputEvent_CTRL_DOWN_MASK,
         java_awt_event_InputEvent_CTRL_MASK,
         java_awt_event_KeyEvent_VK_CONTROL
@@ -301,8 +291,6 @@ nsKeyToJavaModifierTable[] =
         //kCGSFlagsMaskAppleRightCommandKey,
         55,
         54,
-        NO,
-        NO,
         java_awt_event_InputEvent_META_DOWN_MASK,
         java_awt_event_InputEvent_META_MASK,
         java_awt_event_KeyEvent_VK_META
@@ -312,28 +300,35 @@ nsKeyToJavaModifierTable[] =
         //kCGSFlagsMaskAppleLeftAlternateKey,
         //kCGSFlagsMaskAppleRightAlternateKey,
         58,
-        61,
-        NO,
-        NO,
+        0,
         java_awt_event_InputEvent_ALT_DOWN_MASK,
         java_awt_event_InputEvent_ALT_MASK,
         java_awt_event_KeyEvent_VK_ALT
     },
+    {
+        NSAlternateKeyMask,
+        0,
+        61,
+        java_awt_event_InputEvent_ALT_DOWN_MASK | java_awt_event_InputEvent_ALT_GRAPH_DOWN_MASK,
+        java_awt_event_InputEvent_ALT_MASK | java_awt_event_InputEvent_ALT_GRAPH_MASK,
+        java_awt_event_KeyEvent_VK_ALT | java_awt_event_KeyEvent_VK_ALT_GRAPH
+    },
     // NSNumericPadKeyMask
     {
         NSHelpKeyMask,
         0,
         0,
-        NO,
-        NO,
         0, // no Java equivalent
         0, // no Java equivalent
         java_awt_event_KeyEvent_VK_HELP
     },
     // NSFunctionKeyMask
-    {0, 0, 0, NO, NO, 0, 0, 0}
+    {0, 0, 0, 0, 0, 0}
 };
 
+static BOOL leftAltKeyPressed;
+static BOOL altGRPressed = NO;
+
 /*
  * Almost all unicode characters just go from NS to Java with no translation.
  *  For the few exceptions, we handle it here with this small table.
@@ -725,7 +720,7 @@ NsKeyModifiersToJavaKeyInfo(NSUInteger nsFlags, unsigned short eventKeyCode,
 {
     static NSUInteger sPreviousNSFlags = 0;
 
-    struct _nsKeyToJavaModifier* cur;
+    const struct _nsKeyToJavaModifier* cur;
     NSUInteger oldNSFlags = sPreviousNSFlags;
     NSUInteger changedNSFlags = oldNSFlags ^ nsFlags;
     sPreviousNSFlags = nsFlags;
@@ -735,41 +730,27 @@ NsKeyModifiersToJavaKeyInfo(NSUInteger nsFlags, unsigned short eventKeyCode,
     *javaKeyType = java_awt_event_KeyEvent_KEY_PRESSED;
 
     for (cur = nsKeyToJavaModifierTable; cur->nsMask != 0; ++cur) {
-        if (eventKeyCode != 0) {
-            // if key code is specified we are able to determine its location
-            // also it is possible to track the pressed state of the corresponding key
-            if (cur->leftKeyCode == eventKeyCode) {
-                // specified key code switches the pressed state only if the current mask is set
-                cur->leftKeyPressed = !cur->leftKeyPressed && (cur->nsMask & nsFlags);
-                *javaKeyCode = cur->javaKey;
-                *javaKeyLocation = java_awt_event_KeyEvent_KEY_LOCATION_LEFT;
-                *javaKeyType = cur->leftKeyPressed
-                        ? java_awt_event_KeyEvent_KEY_PRESSED
-                        : java_awt_event_KeyEvent_KEY_RELEASED;
-                break;
-            }
-            if (cur->rightKeyCode == eventKeyCode) {
-                // specified key code switches the pressed state only if the current mask is set
-                cur->rightKeyPressed = !cur->rightKeyPressed && (cur->nsMask & nsFlags);
-                *javaKeyCode = cur->javaKey;
-                if (RIGHT_ALT_AS_ALT_GRAPH && cur->nsMask == NSAlternateKeyMask) {
-                    // special case - consider right Alt as AltGr:
-                    *javaKeyCode = java_awt_event_KeyEvent_VK_ALT_GRAPH;
-                }
-                *javaKeyLocation = java_awt_event_KeyEvent_KEY_LOCATION_RIGHT;
-                *javaKeyType = cur->rightKeyPressed
-                        ? java_awt_event_KeyEvent_KEY_PRESSED
-                        : java_awt_event_KeyEvent_KEY_RELEASED;
-                break;
-            }
-        }
-        // skip current record in the table if current mask is not changed
         if (changedNSFlags & cur->nsMask) {
             *javaKeyCode = cur->javaKey;
             *javaKeyLocation = java_awt_event_KeyEvent_KEY_LOCATION_STANDARD;
-            *javaKeyType = (cur->nsMask & nsFlags)
-                    ? java_awt_event_KeyEvent_KEY_PRESSED
-                    : java_awt_event_KeyEvent_KEY_RELEASED;
+            // TODO: uses SPI...
+            //if (changedNSFlags & cur->cgsLeftMask) {
+            //    *javaKeyLocation = java_awt_event_KeyEvent_KEY_LOCATION_LEFT;
+            //} else if (changedNSFlags & cur->cgsRightMask) {
+            //    *javaKeyLocation = java_awt_event_KeyEvent_KEY_LOCATION_RIGHT;
+            //}
+            if (eventKeyCode == cur->leftKeyCode) {
+                leftAltKeyPressed = YES;
+                *javaKeyLocation = java_awt_event_KeyEvent_KEY_LOCATION_LEFT;
+            } else if (eventKeyCode == cur->rightKeyCode) {
+                *javaKeyLocation = java_awt_event_KeyEvent_KEY_LOCATION_RIGHT;
+            } else if (cur->nsMask == NSAlternateKeyMask) {
+                leftAltKeyPressed = NO;
+                continue;
+            }
+            *javaKeyType = (cur->nsMask & nsFlags) ?
+            java_awt_event_KeyEvent_KEY_PRESSED :
+            java_awt_event_KeyEvent_KEY_RELEASED;
             break;
         }
     }
@@ -781,17 +762,22 @@ NsKeyModifiersToJavaKeyInfo(NSUInteger nsFlags, unsigned short eventKeyCode,
 jint NsKeyModifiersToJavaModifiers(NSUInteger nsFlags, BOOL isExtMods)
 {
     jint javaModifiers = 0;
-    struct _nsKeyToJavaModifier* cur;
+    const struct _nsKeyToJavaModifier* cur;
 
     for (cur = nsKeyToJavaModifierTable; cur->nsMask != 0; ++cur) {
-        if (cur->nsMask & nsFlags) {
-            if (RIGHT_ALT_AS_ALT_GRAPH && cur->nsMask == NSAlternateKeyMask && cur->rightKeyPressed) {
-                // special case - consider right Alt as AltGr:
-                javaModifiers |= isExtMods
-                        ? java_awt_event_InputEvent_ALT_GRAPH_DOWN_MASK
-                        : java_awt_event_InputEvent_ALT_GRAPH_MASK;
-                if (!cur->leftKeyPressed) continue; // ignore Alt mask
-            }
+        if ((cur->nsMask & nsFlags) != 0) {
+
+            if (cur->nsMask == NSAlternateKeyMask) {
+                if (leftAltKeyPressed == YES) {
+                    javaModifiers |= isExtMods? cur->javaExtMask : cur->javaMask;
+                    if (altGRPressed == NO)
+                        break;
+                    } else {
+                        leftAltKeyPressed = YES;
+                        altGRPressed = YES;
+                        continue;
+                    }
+                }
             javaModifiers |= isExtMods ? cur->javaExtMask : cur->javaMask;
         }
     }
@@ -805,7 +791,7 @@ jint NsKeyModifiersToJavaModifiers(NSUInteger nsFlags, BOOL isExtMods)
 NSUInteger JavaModifiersToNsKeyModifiers(jint javaModifiers, BOOL isExtMods)
 {
     NSUInteger nsFlags = 0;
-    struct _nsKeyToJavaModifier* cur;
+    const struct _nsKeyToJavaModifier* cur;
 
     for (cur = nsKeyToJavaModifierTable; cur->nsMask != 0; ++cur) {
         jint mask = isExtMods? cur->javaExtMask : cur->javaMask;
@@ -813,16 +799,15 @@ NSUInteger JavaModifiersToNsKeyModifiers(jint javaModifiers, BOOL isExtMods)
             nsFlags |= cur->nsMask;
         }
     }
-    if (RIGHT_ALT_AS_ALT_GRAPH) {
-        // special case - consider right Alt as AltGr:
-        jint mask = isExtMods
-                ? java_awt_event_InputEvent_ALT_GRAPH_DOWN_MASK
-                : java_awt_event_InputEvent_ALT_GRAPH_MASK;
 
-        if ((mask & javaModifiers) != 0) {
-            nsFlags |= NSAlternateKeyMask;
-        }
+    // special case
+    jint mask = isExtMods? java_awt_event_InputEvent_ALT_GRAPH_DOWN_MASK :
+                           java_awt_event_InputEvent_ALT_GRAPH_MASK;
+
+    if ((mask & javaModifiers) != 0) {
+        nsFlags |= NSAlternateKeyMask;
     }
+
     return nsFlags;
 }
 

src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m

@@ -295,36 +295,38 @@ static BOOL shouldUsePressAndHold() {
     if (fEnablePressAndHold && [event willBeHandledByComplexInputMethod] &&
          fInputMethodLOCKABLE)
     {
+        BOOL skipProcessingCancelKeys = YES;
         fProcessingKeystroke = NO;
         if (!fInPressAndHold) {
             fInPressAndHold = YES;
             fPAHNeedsToSelect = YES;
-        } else if (IS_OSX_GT10_13) {
-            // Abandon input to reset IM and unblock input after canceling
-            // input accented symbols (macOS 10.14+ only)
-
+        } else {
             switch([event keyCode]) {
-                case kVK_Escape:
-                case kVK_Delete:
-                case kVK_Return:
                 case kVK_ForwardDelete:
+                case kVK_Delete:
+                    skipProcessingCancelKeys = NO;
+                case kVK_Return:
+                case kVK_Escape:
                 case kVK_PageUp:
                 case kVK_PageDown:
                 case kVK_DownArrow:
                 case kVK_UpArrow:
                 case kVK_Home:
                 case kVK_End:
-                   [self abandonInput];
-                   break;
+                    if (IS_OSX_GT10_13) {
+                        // Abandon input to reset IM and unblock input after
+                        // canceling input accented symbols (macOS 10.14+ only)
+                        [self abandonInput];
+                    }
+                    break;
             }
         }
-        return;
+        if (skipProcessingCancelKeys) {
+            return;
+        }
     }
 
-    NSString *eventCharacters = [event characters];
-    BOOL isDeadKey = (eventCharacters != nil && [eventCharacters length] == 0);
-
-    if ((![self hasMarkedText] && fKeyEventsNeeded) || isDeadKey) {
+    if ((![self hasMarkedText] && fKeyEventsNeeded)) {
         [self deliverJavaKeyEventHelper: event];
     }
 
@@ -346,8 +348,6 @@ static BOOL shouldUsePressAndHold() {
     AWTToolkit.latestPerformKeyEquivalentEvent = event;
     [event retain];
 
-    if ([event keyCode] == 0) return NO;
-
     if ([event keyCode] == 24 && [[event characters] isEqual:@"+"]) {
         return 0;
     }
@@ -511,7 +511,7 @@ static BOOL shouldUsePressAndHold() {
     const UCKeyboardLayout *keyboardLayout =  (UCKeyboardLayout*)CFDataGetBytePtr(keyLayoutPtr);
 
     UInt32 isDeadKeyPressed;
-    UInt32 lengthOfBuffer = 4;
+    UInt32 lengthOfBuffer = 8;
     UniChar stringWithChars[lengthOfBuffer];
     UniCharCount actualLength;
 
@@ -522,7 +522,6 @@ static BOOL shouldUsePressAndHold() {
                    0,
                    LMGetKbdType(),
                    0,
-                   // ignore for now
                    &isDeadKeyPressed,
                    lengthOfBuffer,
                    &actualLength,

src/java.desktop/macosx/native/libawt_lwawt/awt/CFileDialog.m

@@ -142,6 +142,7 @@ canChooseDirectories:(BOOL)inChooseDirectories
                  [thePanel setNameFieldStringValue:fFile];
             }
 
+            CMenuBar *menuBar = nil;
             if (fOwner != nil) {
 
                 // Finds appropriate menubar in our hierarchy,
@@ -150,7 +151,6 @@ canChooseDirectories:(BOOL)inChooseDirectories
                     awtWindow = awtWindow.ownerWindow;
                 }
 
-                CMenuBar *menuBar = nil;
                 BOOL isDisabled = NO;
                 if ([awtWindow.nsWindow isVisible]){
                     menuBar = awtWindow.javaMenuBar;
@@ -180,6 +180,9 @@ canChooseDirectories:(BOOL)inChooseDirectories
                     }
                     [fURLs retain];
                     [NSApp stopModal];
+                    if (menuBar != nil) {
+                        [CMenuBar activate:menuBar modallyDisabled:NO];
+                    }
                 }
             ];
 

src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLGraphicsConfig.m

@@ -334,20 +334,33 @@ Java_sun_java2d_opengl_CGLGraphicsConfig_getCGLConfigInfo
 
     Boolean status = false;
     Boolean fontSmoothingDisabled =
-        CFPreferencesGetAppBooleanValue(
+            CFPreferencesGetAppBooleanValue(
             CFSTR("CGFontRenderingFontSmoothingDisabled"),
             kCFPreferencesCurrentApplication, &status);
 
     if (status) {
         if (fontSmoothingDisabled) {
             J2dRlsTraceLn(J2D_TRACE_INFO,
-                          "LCD_SHADER: disabled via macOS settings");
+                    "LCD_SHADER: disabled via macOS settings");
             caps &= ~CAPS_EXT_LCD_SHADER;
         }
     } else if (IS_OSX_GT10_13) {
-        J2dRlsTraceLn(J2D_TRACE_INFO,
-                      "LCD_SHADER: disabled on macOS 10.14+ by default");
-        caps &= ~CAPS_EXT_LCD_SHADER;
+        // Adding support for "Use font smoothing when available" setting
+        Boolean status = false;
+        Boolean smoothFonts = CFPreferencesGetAppBooleanValue(
+                CFSTR("AppleFontSmoothing"),
+                kCFPreferencesCurrentApplication,
+                &status);
+
+        if (!status) {
+            smoothFonts = YES;
+        }
+
+        if (!smoothFonts) {
+            J2dRlsTraceLn(J2D_TRACE_INFO,
+                    "LCD_SHADER: disabled on macOS 10.14+ by default");
+            caps &= ~CAPS_EXT_LCD_SHADER;
+        }
     }
 
     GLint value = 0;

src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java

@@ -1458,7 +1458,7 @@ public class GTKLookAndFeel extends SynthLookAndFeel {
             if (dpi < 50) {
                 dpi = 50;
             }
-            X11GraphicsDevice.setGlobalScale(Math.round(dpi / 96f));
+            X11GraphicsDevice.setGlobalDPI(dpi);
         }
     }
 

src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java

@@ -767,6 +767,14 @@ class GTKStyle extends SynthStyle implements GTKConstants {
         if (classKey != null) {
             Object value = getClassSpecificValue(classKey);
             if (value != null) {
+                //This is a workaround as the "slider-length" property has been
+                //deprecated for GtkScale from gtk 3.20, so default value of 31
+                //is used and makes redering of slider wrong. Value 14 is being
+                //used as default value for Slider.thumbHeight is 14 and making
+                //width 14 as well makes slider thumb render in proper shape
+                if ("Slider.thumbWidth".equals(key) && value.equals(31)) {
+                    return 14;
+                }
                 return value;
             }
         }
@@ -779,8 +787,15 @@ class GTKStyle extends SynthStyle implements GTKConstants {
             return getColorForState(context, ColorType.FOREGROUND);
         }
         else if (key == "ScrollBar.minimumThumbSize") {
+            //This is a workaround as the "min-slider-length" property has been
+            //deprecated for GtkScrollBar from gtk 3.20, so default value of 21
+            //is used and makes ScrollBar thumb very small. Value 40 is being
+            //used as this is the value mentioned in css files
             int len =
                 getClassSpecificIntValue(context, "min-slider-length", 21);
+            if (len == 21) {
+                len = 40;
+            }
             JScrollBar sb = (JScrollBar)context.getComponent();
             if (sb.getOrientation() == JScrollBar.HORIZONTAL) {
                 return new DimensionUIResource(len, 0);

src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/PangoFonts.java

@@ -171,7 +171,7 @@ class PangoFonts {
         }
         if (value instanceof Integer) {
             dpi = ((Integer)value).intValue() / 1024;
-            if (dpi == -1 || SunGraphicsEnvironment.isUIScaleEnabled()) {
+            if (dpi == -1 || SunGraphicsEnvironment.isUIScaleEnabled(dpi)) {
               dpi = 96;
             }
             if (dpi < 50) { /* 50 dpi is the minimum value gnome allows */

src/java.desktop/share/classes/java/awt/Dialog.java

@@ -663,13 +663,6 @@ public class Dialog extends Window {
     public Dialog(Window owner, String title, ModalityType modalityType) {
         super(owner);
 
-        if ((owner != null) &&
-            !(owner instanceof Frame) &&
-            !(owner instanceof Dialog))
-        {
-            throw new IllegalArgumentException("Wrong parent window");
-        }
-
         this.title = title;
         setModalityType(modalityType);
         SunToolkit.checkAndSetPolicy(this);

src/java.desktop/share/classes/javax/swing/BufferStrategyPaintManager.java

@@ -496,12 +496,18 @@ class BufferStrategyPaintManager extends RepaintManager.PaintManager {
                     }
                 }
 
-                if (bsg != null && !c.isOpaque() &&
-                        ((SunGraphics2D)bsg).getSurfaceData().getTransparency() ==
-                                Transparency.OPAQUE) return false;
-
                 if (isPaint && c == rootJ && x == 0 && y == 0 &&
                       c.getWidth() == w && c.getHeight() == h) {
+
+                    // Fallback to normal painting in undecorated non-opaque dialogs
+                    // and frames to resolve black background problem
+                    if ((root instanceof Dialog && ((Dialog)root).isUndecorated() ||
+                         root instanceof Frame && ((Frame)root).isUndecorated()) &&
+                            bsg != null && !c.isOpaque() &&
+                            ((SunGraphics2D)bsg).getSurfaceData().getTransparency() ==
+                                    Transparency.OPAQUE) {
+                        return false;
+                    }
                     bufferInfo.setInSync(true);
                 }
                 else if (contentsLost) {

src/java.desktop/share/classes/javax/swing/PopupFactory.java

@@ -347,7 +347,7 @@ public class PopupFactory {
         private static final Object heavyWeightPopupCacheKey =
                  new StringBuffer("PopupFactory.heavyWeightPopupCache");
 
-        private volatile boolean isCacheEnabled = true;
+        private volatile boolean isCacheEnabled = false;
 
         /**
          * Returns either a new or recycled <code>Popup</code> containing

src/java.desktop/share/classes/sun/font/FileFontStrike.java

@@ -286,20 +286,6 @@ public class FileFontStrike extends PhysicalStrike {
             SunFontManager.getInstance().deRegisterBadFont(fileFont);
             return;
         }
-
-        /* Always get the image and the advance together for smaller sizes
-         * that are likely to be important to rendering performance.
-         * The pixel size of 48.0 can be thought of as
-         * "maximumSizeForGetImageWithAdvance".
-         * This should be no greater than OutlineTextRender.THRESHOLD.
-         */
-        double maxSz = 48.0;
-        getImageWithAdvance =
-                Math.abs(at.getScaleX()) <= maxSz &&
-                        Math.abs(at.getScaleY()) <= maxSz &&
-                        Math.abs(at.getShearX()) <= maxSz &&
-                        Math.abs(at.getShearY()) <= maxSz;
-
         /* First, see if native code should be used to create the glyph.
          * GDI will return the integer metrics, not fractional metrics, which
          * may be requested for this strike, so we would require here that :
@@ -323,7 +309,6 @@ public class FileFontStrike extends PhysicalStrike {
             }
             intPtSize = (int) pts;
             useNatives = (rotation == 0 || rotation > 0 && useNativesForRotatedText) && pts >= 3.0 && pts <= 100.0 &&
-                    (getImageWithAdvance || desc.fmHint == INTVAL_FRACTIONALMETRICS_ON) &&
                     !((TrueTypeFont)fileFont).useEmbeddedBitmapsForSize(intPtSize);
         }
         else if (fileFont.checkUseNatives() && desc.aaHint==0 && !algoStyle) {
@@ -356,6 +341,19 @@ public class FileFontStrike extends PhysicalStrike {
         }
         this.disposer = new FontStrikeDisposer(fileFont, desc, pScalerContext);
 
+        /* Always get the image and the advance together for smaller sizes
+         * that are likely to be important to rendering performance.
+         * The pixel size of 48.0 can be thought of as
+         * "maximumSizeForGetImageWithAdvance".
+         * This should be no greater than OutlineTextRender.THRESHOLD.
+         */
+        double maxSz = 48.0;
+        getImageWithAdvance =
+            Math.abs(at.getScaleX()) <= maxSz &&
+            Math.abs(at.getScaleY()) <= maxSz &&
+            Math.abs(at.getShearX()) <= maxSz &&
+            Math.abs(at.getShearY()) <= maxSz;
+
         /* Some applications request advance frequently during layout.
          * If we are not getting and caching the image with the advance,
          * there is a potentially significant performance penalty if the
@@ -436,13 +434,18 @@ public class FileFontStrike extends PhysicalStrike {
             }
         }
         if (ptr == 0) {
-            boolean fm = desc.fmHint == INTVAL_FRACTIONALMETRICS_ON;
-            ptr = _getGlyphImageFromWindows(family, style, size, glyphCode, fm, rotation, charset);
-            if (ptr != 0 && fm) {
-                Point2D.Float metrics = new Point2D.Float();
-                fileFont.getGlyphMetrics(pScalerContext, glyphCode, metrics);
-                StrikeCache.unsafe.putFloat(ptr + StrikeCache.xAdvanceOffset, metrics.x);
-                StrikeCache.unsafe.putFloat(ptr + StrikeCache.yAdvanceOffset, metrics.y);
+            ptr = _getGlyphImageFromWindows(family, style, size, glyphCode,
+                    desc.fmHint == INTVAL_FRACTIONALMETRICS_ON, rotation, charset);
+            if (ptr != 0 && (rotation == 0 || rotation == 2)) {
+                /* Get the advance from the JDK rasterizer. This is mostly
+                 * necessary for the fractional metrics case, but there are
+                 * also some very small number (<0.25%) of marginal cases where
+                 * there is some rounding difference between windows and JDK.
+                 * After these are resolved, we can restrict this extra
+                 * work to the FM case.
+                 */
+                float advance = getGlyphAdvance(glyphCode, false);
+                StrikeCache.unsafe.putFloat(ptr + StrikeCache.xAdvanceOffset, advance);
             }
         }
         if (ptr == 0) {

src/java.desktop/share/classes/sun/font/FontFamily.java

@@ -61,7 +61,7 @@ public class FontFamily {
      */
     static void remove(Font2D font2D) {
 
-        String name = font2D.familyName;
+        String name = font2D.getFamilyName(Locale.ENGLISH);
         FontFamily family = getFamily(name);
         if (family == null) {
             return;

src/java.desktop/share/classes/sun/java2d/SunGraphicsEnvironment.java

@@ -67,7 +67,9 @@ public abstract class SunGraphicsEnvironment extends GraphicsEnvironment
     public static boolean isOpenSolaris;
     private static Font defaultFont;
 
-    private static final boolean uiScaleEnabled;
+    private static final Object UI_SCALE_LOCK = new Object();
+    private static boolean uiScaleEnabled;
+    private static Boolean uiScaleEnabled_overridden;
     private static final double debugScale;
 
     static {
@@ -370,7 +372,27 @@ public abstract class SunGraphicsEnvironment extends GraphicsEnvironment
     }
 
     public static boolean isUIScaleEnabled() {
-        return uiScaleEnabled;
+        Boolean enabledOverridden = uiScaleEnabled_overridden;
+        return enabledOverridden != null ? enabledOverridden : uiScaleEnabled;
+    }
+
+    /**
+     * Overrides isUIScaleEnabled() to false for fractional scale on Linux.
+     *
+     * [tav] todo: temp until fract scale is supported on Linux
+     */
+    public static boolean isUIScaleEnabled(int dpi) {
+        if (FontUtilities.isLinux) {
+            if (uiScaleEnabled_overridden == null) {
+                synchronized (UI_SCALE_LOCK) {
+                    if (uiScaleEnabled_overridden == null) {
+                        uiScaleEnabled_overridden =
+                            Double.compare(dpi / 96.0, Math.floor(dpi / 96.0)) == 0 && uiScaleEnabled;
+                    }
+                }
+            }
+        }
+        return isUIScaleEnabled();
     }
 
     public static double getDebugScale() {

src/java.desktop/share/classes/sun/java2d/opengl/OGLSurfaceData.java

@@ -396,12 +396,10 @@ public abstract class OGLSurfaceData extends SurfaceData
      * more code just to support a few uncommon cases.
      */
     public boolean canRenderLCDText(SunGraphics2D sg2d) {
-        return
-            graphicsConfig.isCapPresent(CAPS_EXT_LCD_SHADER) &&
-            sg2d.surfaceData.getTransparency() == Transparency.OPAQUE &&
-            sg2d.paintState <= SunGraphics2D.PAINT_OPAQUECOLOR &&
-            (sg2d.compositeState <= SunGraphics2D.COMP_ISCOPY ||
-             (sg2d.compositeState <= SunGraphics2D.COMP_ALPHA && canHandleComposite(sg2d.composite)));
+        return graphicsConfig.isCapPresent(CAPS_EXT_LCD_SHADER) &&
+                sg2d.paintState <= SunGraphics2D.PAINT_OPAQUECOLOR &&
+                (sg2d.compositeState <= SunGraphics2D.COMP_ISCOPY ||
+                        (sg2d.compositeState <= SunGraphics2D.COMP_ALPHA && canHandleComposite(sg2d.composite)));
     }
 
     private boolean canHandleComposite(Composite c) {

src/java.desktop/share/native/common/java2d/opengl/OGLTextRenderer.c

@@ -1151,6 +1151,10 @@ OGLTR_DrawGlyphList(JNIEnv *env, OGLContext *oglc, OGLSDOps *dstOps,
                 ok = OGLTR_DrawGrayscaleGlyphNoCache(oglc, ginfo, x, y);
             }
         } else if (ginfo->rowBytes == ginfo->width * 4) {
+            if (lcdOpened) {
+                lcdOpened = JNI_FALSE;
+                j2d_glEnd();
+            }
             // color glyph data
             ok = OGLTR_DrawColorGlyphNoCache(oglc, ginfo, x, y);
         } else {

src/java.desktop/share/native/libfontmanager/freetypeScaler.c

@@ -77,7 +77,6 @@
 #define  DEFAULT_DPI 72
 #define  MAX_DPI 1024
 #define  ADJUST_FONT_SIZE(X, DPI) (((X)*DEFAULT_DPI + ((DPI)>>1))/(DPI))
-#define  MAX_FCSIZE_LTL_DISABLED 12.0
 
 #ifndef DISABLE_FONTCONFIG
 #define FONTCONFIG_DLL JNI_LIB_NAME("fontconfig")
@@ -644,21 +643,17 @@ static void setDefaultScalerSettings(FTScalerContext *context) {
 
 #ifndef DISABLE_FONTCONFIG
 static void setupLoadRenderFlags(FTScalerContext *context, int fcHintStyle, FcBool fcAutohint, FcBool fcAutohintSet,
-                          FT_Int32 fcLoadFlags, FT_Render_Mode fcRenderFlags, double fcSize)
+                          FT_Int32 fcLoadFlags, FT_Render_Mode fcRenderFlags)
 {
-    if (fcSize > MAX_FCSIZE_LTL_DISABLED  ||  !fcAutohintSet || fcAutohint) {
-        switch (fcHintStyle) {
-            case FC_HINT_NONE:
-                context->loadFlags = FT_LOAD_NO_HINTING;
-                break;
-            case FC_HINT_SLIGHT:
-                context->loadFlags = (fcRenderFlags != FT_RENDER_MODE_MONO) ? FT_LOAD_TARGET_LIGHT : FT_LOAD_NO_HINTING;
-                break;
-            default:
-                context->loadFlags = fcLoadFlags;
-        }
-    } else {
-        context->loadFlags = fcLoadFlags;
+    switch (fcHintStyle) {
+        case FC_HINT_NONE:
+            context->loadFlags = FT_LOAD_NO_HINTING;
+            break;
+        case FC_HINT_SLIGHT:
+            context->loadFlags = (fcRenderFlags != FT_RENDER_MODE_MONO) ? FT_LOAD_TARGET_LIGHT : FT_LOAD_NO_HINTING;
+            break;
+        default:
+            context->loadFlags = fcLoadFlags;
     }
 
     context->renderFlags = fcRenderFlags;
@@ -798,10 +793,10 @@ static int setupFTContext(JNIEnv *env, jobject font2D, FTScalerInfo *scalerInfo,
             if (logFC && fcAutohintSet) fprintf(stderr, "FC_AUTOHINT(%d) ", fcAutohint);
 
             if (context->aaType == TEXT_AA_ON) { // Greyscale AA
-                setupLoadRenderFlags(context, fcHintStyle, fcAutohint, fcAutohintSet, FT_LOAD_DEFAULT, FT_RENDER_MODE_NORMAL, fcSize);
+                setupLoadRenderFlags(context, fcHintStyle, fcAutohint, fcAutohintSet, FT_LOAD_DEFAULT, FT_RENDER_MODE_NORMAL);
             }
             else if (context->aaType == TEXT_AA_OFF) { // No AA
-                setupLoadRenderFlags(context, fcHintStyle, fcAutohint, fcAutohintSet, FT_LOAD_TARGET_MONO, FT_RENDER_MODE_MONO, fcSize);
+                setupLoadRenderFlags(context, fcHintStyle, fcAutohint, fcAutohintSet, FT_LOAD_TARGET_MONO, FT_RENDER_MODE_MONO);
             } else {
                 int fcRGBA = FC_RGBA_UNKNOWN;
                 if (fcAntialiasSet && fcAntialias) {
@@ -811,13 +806,13 @@ static int setupFTContext(JNIEnv *env, jobject font2D, FTScalerInfo *scalerInfo,
                             case FC_RGBA_BGR:
                                 if (logFC) fprintf(stderr, fcRGBA == FC_RGBA_RGB ? "FC_RGBA_RGB " : "FC_RGBA_BGR ");
                                 setupLoadRenderFlags(context, fcHintStyle, fcAutohint, fcAutohintSet,
-                                                     FT_LOAD_TARGET_LCD, FT_RENDER_MODE_LCD, fcSize);
+                                                     FT_LOAD_TARGET_LCD, FT_RENDER_MODE_LCD);
                                 break;
                             case FC_RGBA_VRGB:
                             case FC_RGBA_VBGR:
                                 if (logFC) fprintf(stderr, fcRGBA == FC_RGBA_VRGB ? "FC_RGBA_VRGB " : "FC_RGBA_VBGR ");
                                 setupLoadRenderFlags(context, fcHintStyle, fcAutohint, fcAutohintSet,
-                                                     FT_LOAD_TARGET_LCD_V, FT_RENDER_MODE_LCD_V, fcSize);
+                                                     FT_LOAD_TARGET_LCD_V, FT_RENDER_MODE_LCD_V);
                                 break;
                             case FC_RGBA_NONE:
                                 if (logFC) fprintf(stderr, "FC_RGBA_NONE ");
@@ -833,10 +828,10 @@ static int setupFTContext(JNIEnv *env, jobject font2D, FTScalerInfo *scalerInfo,
                     if (context->aaType == TEXT_AA_LCD_HRGB ||
                         context->aaType == TEXT_AA_LCD_HBGR) {
                         setupLoadRenderFlags(context, fcHintStyle, fcAutohint, fcAutohintSet,
-                                             FT_LOAD_TARGET_LCD, FT_RENDER_MODE_LCD, fcSize);
+                                             FT_LOAD_TARGET_LCD, FT_RENDER_MODE_LCD);
                     } else {
                         setupLoadRenderFlags(context, fcHintStyle, fcAutohint, fcAutohintSet,
-                                             FT_LOAD_TARGET_LCD_V, FT_RENDER_MODE_LCD_V, fcSize);
+                                             FT_LOAD_TARGET_LCD_V, FT_RENDER_MODE_LCD_V);
                     }
                 }
             }
@@ -892,7 +887,7 @@ Java_sun_font_FreetypeFontScaler_getFontMetricsNative(
         jlong pScalerContext, jlong pScaler) {
 
     jobject metrics;
-    jfloat ax, ay, dx, dy, bx, by, lx, ly, mx, my;
+    jfloat ax, ay, dx, dy, bx, by, lx, ly, mx, my, txx, txy, tyx, tyy;
     jfloat f0 = 0.0;
     FTScalerContext *context =
         (FTScalerContext*) jlong_to_ptr(pScalerContext);
@@ -932,14 +927,6 @@ Java_sun_font_FreetypeFontScaler_getFontMetricsNative(
     /* See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=657854 */
 #define FT_MulFixFloatShift6(a, b) (((float) (a)) * ((float) (b)) / 65536.0 / 64.0)
 
-#define contextAwareMetricsX(x, y) \
-    (FTFixedToFloat(context->transform.xx) * (x) - \
-     FTFixedToFloat(context->transform.xy) * (y))
-
-#define contextAwareMetricsY(x, y) \
-    (-FTFixedToFloat(context->transform.yx) * (x) + \
-     FTFixedToFloat(context->transform.yy) * (y))
-
     /*
      * See FreeType source code: src/base/ftobjs.c ft_recompute_scaled_metrics()
      * http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1659
@@ -969,14 +956,24 @@ Java_sun_font_FreetypeFontScaler_getFontMetricsNative(
                      OBLIQUE_MODIFIER(scalerInfo->face->size->metrics.height));
     my = 0;
 
+    // apply transformation matrix
+    txx = (jfloat)  FTFixedToFloat(context->transform.xx);
+    txy = (jfloat) -FTFixedToFloat(context->transform.xy);
+    tyx = (jfloat) -FTFixedToFloat(context->transform.yx);
+    tyy = (jfloat)  FTFixedToFloat(context->transform.yy);
+    ax = txy * ay;
+    ay = tyy * ay;
+    dx = txy * dy;
+    dy = tyy * dy;
+    lx = txy * ly;
+    ly = tyy * ly;
+    my = tyx * mx;
+    mx = txx * mx;
+
     metrics = (*env)->NewObject(env,
-        sunFontIDs.strikeMetricsClass,
-        sunFontIDs.strikeMetricsCtr,
-        contextAwareMetricsX(ax, ay), contextAwareMetricsY(ax, ay),
-        contextAwareMetricsX(dx, dy), contextAwareMetricsY(dx, dy),
-        bx, by,
-        contextAwareMetricsX(lx, ly), contextAwareMetricsY(lx, ly),
-        contextAwareMetricsX(mx, my), contextAwareMetricsY(mx, my));
+                                sunFontIDs.strikeMetricsClass,
+                                sunFontIDs.strikeMetricsCtr,
+                                ax, ay, dx, dy, bx, by, lx, ly, mx, my);
 
     return metrics;
 }
@@ -1277,7 +1274,7 @@ Java_sun_font_FreetypeFontScaler_getGlyphImageNative(
         glyphInfo->advanceX =
             (float) (advh * FTFixedToFloat(context->transform.xx));
         glyphInfo->advanceY =
-            (float) (-advh * FTFixedToFloat(context->transform.yx));
+            (float) (advh * FTFixedToFloat(context->transform.xy));
     } else {
         if (!ftglyph->advance.y) {
             glyphInfo->advanceX =

src/java.desktop/unix/classes/sun/awt/X11/XComponentPeer.java

@@ -293,21 +293,15 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget
                * when a component inside a Frame is requesting focus.
                * See 6314575 for details.
                */
-              boolean res = wpeer.requestWindowFocus(null);
-
-              if (focusLog.isLoggable(PlatformLogger.Level.FINER)) {
-                  focusLog.finer("Requested window focus: " + res);
-              }
-              // If parent window can be made focused and has been made focused(synchronously)
-              // then we can proceed with children, otherwise we retreat.
-              if (!(res && parentWindow.isFocused())) {
-                  return rejectFocusRequestHelper("Waiting for asynchronous processing of the request");
-              }
-              return XKeyboardFocusManagerPeer.deliverFocus(lightweightChild,
-                                                            target,
-                                                            temporary,
-                                                            focusedWindowChangeAllowed,
-                                                            time, cause);
+              return wpeer.requestWindowFocus(null, () -> {
+                  XKeyboardFocusManagerPeer.deliverFocus(lightweightChild,
+                          (Component)target,
+                          temporary,
+                          focusedWindowChangeAllowed,
+                          time, cause);
+              }, () -> {
+                  rejectFocusRequestHelper("Waiting for asynchronous processing of the request");
+              });
               // Motif compatibility code
           case XKeyboardFocusManagerPeer.SNFH_SUCCESS_HANDLED:
               // Either lightweight or excessive request - all events are generated.

src/java.desktop/unix/classes/sun/awt/X11/XDecoratedPeer.java

@@ -1218,7 +1218,7 @@ abstract class XDecoratedPeer extends XWindowPeer {
             if (target == activeWindow && target != focusedWindow) {
                 // Happens when an owned window is currently focused
                 focusLog.fine("Focus is on child window - transferring it back to the owner");
-                handleWindowFocusInSync(-1);
+                handleWindowFocusInSync(-1, () -> {});
                 return true;
             }
             Window realNativeFocusedWindow = XWindowPeer.getNativeFocusedWindow();

src/java.desktop/unix/classes/sun/awt/X11/XWindow.java

@@ -394,13 +394,14 @@ class XWindow extends XBaseWindow implements X11ComponentPeer {
         return false;
     }
 
-    static void sendEvent(final AWTEvent e) {
+    static void sendEvent(final AWTEvent e, Runnable lightweigtRequestRunnable) {
         // The uses of this method imply that the incoming event is system-generated
         SunToolkit.setSystemGenerated(e);
         PeerEvent pe = new PeerEvent(Toolkit.getDefaultToolkit(), new Runnable() {
                 public void run() {
                     AWTAccessor.getAWTEventAccessor().setPosted(e);
                     ((Component)e.getSource()).dispatchEvent(e);
+                    lightweigtRequestRunnable.run();
                 }
             }, PeerEvent.ULTIMATE_PRIORITY_EVENT);
         if (focusLog.isLoggable(PlatformLogger.Level.FINER) && (e instanceof FocusEvent)) {
@@ -409,6 +410,9 @@ class XWindow extends XBaseWindow implements X11ComponentPeer {
         XToolkit.postEvent(XToolkit.targetToAppContext(e.getSource()), pe);
     }
 
+    static void sendEvent(final AWTEvent e) {
+        sendEvent(e, () -> {});
+    }
 
 /*
  * Post an event to the event queue.

src/java.desktop/unix/classes/sun/awt/X11/XWindowPeer.java

@@ -44,18 +44,20 @@ import java.awt.SystemColor;
 import java.awt.Window;
 import java.awt.event.ComponentEvent;
 import java.awt.event.FocusEvent;
+import java.awt.event.InvocationEvent;
 import java.awt.event.WindowEvent;
 import java.awt.peer.ComponentPeer;
 import java.awt.peer.WindowPeer;
 import java.io.UnsupportedEncodingException;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.Vector;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.function.BooleanSupplier;
+import java.util.function.Consumer;
 
 import sun.awt.AWTAccessor;
 import sun.awt.AWTAccessor.ComponentAccessor;
@@ -624,11 +626,10 @@ class XWindowPeer extends XPanelPeer implements WindowPeer,
             target.dispatchEvent(we);
         }
     }
-
-    public void handleWindowFocusInSync(long serial) {
+    public void handleWindowFocusInSync(long serial, Runnable lightweigtRequest) {
         WindowEvent we = new WindowEvent((Window)target, WindowEvent.WINDOW_GAINED_FOCUS);
         XKeyboardFocusManagerPeer.getInstance().setCurrentFocusedWindow((Window) target);
-        sendEvent(we);
+        sendEvent(we, lightweigtRequest);
     }
     // NOTE: This method may be called by privileged threads.
     //       DO NOT INVOKE CLIENT CODE ON THIS THREAD!
@@ -849,7 +850,7 @@ class XWindowPeer extends XPanelPeer implements WindowPeer,
         if (focusLog.isLoggable(PlatformLogger.Level.FINE)) {
             focusLog.fine("Requesting window focus");
         }
-        requestWindowFocus(time, timeProvided);
+        requestWindowFocus(time, timeProvided, () -> {}, () -> {});
     }
 
     public final boolean focusAllowedFor() {
@@ -1302,7 +1303,8 @@ class XWindowPeer extends XPanelPeer implements WindowPeer,
         if (isSimpleWindow()) {
             if (target == XKeyboardFocusManagerPeer.getInstance().getCurrentFocusedWindow()) {
                 Window owner = getDecoratedOwner((Window)target);
-                ((XWindowPeer)AWTAccessor.getComponentAccessor().getPeer(owner)).requestWindowFocus();
+                ((XWindowPeer)AWTAccessor.getComponentAccessor().getPeer(owner)).
+                        requestWindowFocus(() -> {}, () -> {});
             }
         }
     }
@@ -1937,16 +1939,25 @@ class XWindowPeer extends XPanelPeer implements WindowPeer,
         return window;
     }
 
-    public boolean requestWindowFocus(XWindowPeer actualFocusedWindow) {
+    public boolean requestWindowFocus(XWindowPeer actualFocusedWindow, Runnable lightweigtRequest, Runnable rejectFocusRequest) {
         setActualFocusedWindow(actualFocusedWindow);
-        return requestWindowFocus();
+        return requestWindowFocus(lightweigtRequest, rejectFocusRequest);
     }
 
     public boolean requestWindowFocus() {
-        return requestWindowFocus(0, false);
+        return requestWindowFocus(() -> {}, () -> {});
+    }
+
+    public boolean requestWindowFocus(Runnable lightweigtRequest, Runnable rejectFocusRequest) {
+        return requestWindowFocus(0, false, lightweigtRequest, rejectFocusRequest);
     }
 
     public boolean requestWindowFocus(long time, boolean timeProvided) {
+        return requestWindowFocus(time, timeProvided, () -> {}, () -> {});
+    }
+
+    public boolean requestWindowFocus(long time, boolean timeProvided,
+                                      Runnable lightweigtRequest, Runnable rejectFocusRequest) {
         focusLog.fine("Request for window focus");
         // If this is Frame or Dialog we can't assure focus request success - but we still can try
         // If this is Window and its owner Frame is active we can be sure request succedded.
@@ -1956,11 +1967,12 @@ class XWindowPeer extends XPanelPeer implements WindowPeer,
 
         if (isWMStateNetHidden()) {
             focusLog.fine("The window is unmapped, so rejecting the request");
+            rejectFocusRequest.run();
             return false;
         }
         if (activeWindow == ownerWindow) {
             focusLog.fine("Parent window is active - generating focus for this window");
-            handleWindowFocusInSync(-1);
+            handleWindowFocusInSync(-1, lightweigtRequest);
             return true;
         }
         focusLog.fine("Parent window is not active");
@@ -1968,9 +1980,11 @@ class XWindowPeer extends XPanelPeer implements WindowPeer,
         XDecoratedPeer wpeer = AWTAccessor.getComponentAccessor().getPeer(ownerWindow);
         if (wpeer != null && wpeer.requestWindowFocus(this, time, timeProvided)) {
             focusLog.fine("Parent window accepted focus request - generating focus for this window");
+            handleWindowFocusInSync(-1, lightweigtRequest);
             return true;
         }
         focusLog.fine("Denied - parent window is not active and didn't accept focus request");
+        rejectFocusRequest.run();
         return false;
     }
 

src/java.desktop/unix/classes/sun/awt/X11GraphicsDevice.java

@@ -524,11 +524,12 @@ public final class X11GraphicsDevice extends GraphicsDevice
         return (int)Math.round(getNativeScaleFactor(screen));
     }
 
-    public static void setGlobalScale(int scale) {
-        globalScale = scale;
+    public static void setGlobalDPI(int dpi) {
+        boolean uiScaleEnabled = SunGraphicsEnvironment.isUIScaleEnabled(dpi);
+        globalScale = uiScaleEnabled ? (int)Math.round(dpi / 96.0) : 1;
         for (GraphicsDevice gd : GraphicsEnvironment.getLocalGraphicsEnvironment().getScreenDevices()) {
             X11GraphicsDevice x11gd = (X11GraphicsDevice)gd;
-            if (x11gd.isNativeScaleDefault) {
+            if (x11gd.isNativeScaleDefault || !uiScaleEnabled) {
                 x11gd.scale = globalScale;
                 x11gd.isNativeScaleDefault = false;
             }

src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.c

@@ -258,6 +258,7 @@ static void empty() {}
 
 static gboolean gtk3_version_3_10 = TRUE;
 static gboolean gtk3_version_3_14 = FALSE;
+static gboolean gtk3_version_3_20 = FALSE;
 
 GtkApi* gtk3_load(JNIEnv *env, const char* lib_name)
 {
@@ -400,6 +401,18 @@ GtkApi* gtk3_load(JNIEnv *env, const char* lib_name)
         }
         gtk3_version_3_14 = !fp_gtk_check_version(3, 14, 0);
 
+        if (!fp_gtk_check_version(3, 20, 0)) {
+            gtk3_version_3_20 = TRUE;
+            fp_gtk_widget_path_copy = dl_symbol("gtk_widget_path_copy");
+            fp_gtk_widget_path_new = dl_symbol("gtk_widget_path_new");
+            fp_gtk_widget_path_append_type = dl_symbol("gtk_widget_path_append_type");
+            fp_gtk_widget_path_iter_set_object_name = dl_symbol("gtk_widget_path_iter_set_object_name");
+            fp_gtk_style_context_set_path = dl_symbol("gtk_style_context_set_path");
+            fp_gtk_widget_path_unref = dl_symbol("gtk_widget_path_unref");
+            fp_gtk_style_context_get_path = dl_symbol("gtk_style_context_get_path");
+            fp_gtk_style_context_new = dl_symbol("gtk_style_context_new");
+        }
+
         fp_gdk_window_create_similar_surface =
                       dl_symbol("gdk_window_create_similar_surface");
         fp_gtk_settings_get_for_screen =
@@ -561,7 +574,6 @@ GtkApi* gtk3_load(JNIEnv *env, const char* lib_name)
                                                 "gtk_combo_box_new_with_entry");
         fp_gtk_separator_tool_item_new = dlsym(gtk3_libhandle,
                                                  "gtk_separator_tool_item_new");
-
         fp_g_list_append = dl_symbol("g_list_append");
         fp_g_list_free = dl_symbol("g_list_free");
         fp_g_list_free_full = dl_symbol("g_list_free_full");
@@ -1362,6 +1374,90 @@ static GtkWidget *gtk3_get_widget(WidgetType widget_type)
     return result;
 }
 
+static void append_element (GtkWidgetPath *path, const gchar *selector)
+{
+    fp_gtk_widget_path_append_type (path, G_TYPE_NONE);
+    fp_gtk_widget_path_iter_set_object_name (path, -1, selector);
+}
+
+static GtkWidgetPath* createWidgetPath(const GtkWidgetPath* path) {
+    if (path == NULL) {
+        return fp_gtk_widget_path_new();
+    } else {
+        return fp_gtk_widget_path_copy(path);
+    }
+}
+
+static GtkStyleContext* get_style(WidgetType widget_type, const gchar *detail)
+{
+    if (!gtk3_version_3_20) {
+        gtk3_widget = gtk3_get_widget(widget_type);
+        GtkStyleContext* context = fp_gtk_widget_get_style_context (gtk3_widget);
+        fp_gtk_style_context_save (context);
+        if (detail != 0) {
+             transform_detail_string(detail, context);
+        }
+        return context;
+    } else {
+        gtk3_widget = gtk3_get_widget(widget_type);
+        GtkStyleContext* widget_context = fp_gtk_widget_get_style_context (gtk3_widget);
+        GtkWidgetPath *path = NULL;
+        if (detail != 0) {
+            if (strcmp(detail, "checkbutton") == 0) {
+                path = createWidgetPath (fp_gtk_style_context_get_path (widget_context));
+                append_element(path, "check");
+            } else if (strcmp(detail, "radiobutton") == 0) {
+                path = createWidgetPath (fp_gtk_style_context_get_path (widget_context));
+                append_element(path, "radio");
+            } else if (strcmp(detail, "vscale") == 0 || strcmp(detail, "hscale") == 0) {
+                path = createWidgetPath (fp_gtk_style_context_get_path (widget_context));
+                append_element(path, "slider");
+            } else if (strcmp(detail, "trough") == 0) {
+                //This is a fast solution to the scrollbar trough not being rendered properly
+                if (widget_type == HSCROLL_BAR || widget_type == HSCROLL_BAR_TRACK ||
+                    widget_type == VSCROLL_BAR || widget_type == VSCROLL_BAR_TRACK) {
+                    path = createWidgetPath (NULL);
+                } else {
+                    path = createWidgetPath (fp_gtk_style_context_get_path (widget_context));
+                }
+                append_element(path, detail);
+            } else if (strcmp(detail, "bar") == 0) {
+                path = createWidgetPath (fp_gtk_style_context_get_path (widget_context));
+                append_element(path, "trough");
+                append_element(path, "progress");
+            } else if (strcmp(detail, "vscrollbar") == 0 || strcmp(detail, "hscrollbar") == 0) {
+                path = createWidgetPath (fp_gtk_style_context_get_path (widget_context));
+                append_element(path, "button");
+            } else if (strcmp(detail, "check") == 0) {
+                path = createWidgetPath (NULL);
+                append_element(path, detail);
+            } else if (strcmp(detail, "option") == 0) {
+                path = createWidgetPath (NULL);
+                append_element(path, "radio");
+            } else {
+                path = createWidgetPath (fp_gtk_style_context_get_path (widget_context));
+                append_element(path, detail);
+            }
+        } else {
+            path = createWidgetPath (fp_gtk_style_context_get_path (widget_context));
+        }
+
+        GtkStyleContext *context = fp_gtk_style_context_new ();
+        fp_gtk_style_context_set_path (context, path);
+        fp_gtk_widget_path_unref (path);
+        return context;
+    }
+}
+
+static void disposeOrRestoreContext(GtkStyleContext *context)
+{
+    if (!gtk3_version_3_20) {
+        fp_gtk_style_context_restore (context);
+    } else {
+        fp_g_object_unref (context);
+    }
+}
+
 static void gtk3_paint_arrow(WidgetType widget_type, GtkStateType state_type,
         GtkShadowType shadow_type, const gchar *detail,
         gint x, gint y, gint width, gint height,
@@ -1509,13 +1605,9 @@ static void gtk3_paint_box(WidgetType widget_type, GtkStateType state_type,
      */
     gtk3_set_direction(gtk3_widget, dir);
 
-    GtkStyleContext* context = fp_gtk_widget_get_style_context (gtk3_widget);
-    fp_gtk_style_context_save (context);
-
-    transform_detail_string(detail, context);
+    GtkStyleContext* context = get_style(widget_type, detail);
 
     GtkStateFlags flags = get_gtk_flags(state_type);
-
     if (shadow_type == GTK_SHADOW_IN && widget_type != COMBO_BOX_ARROW_BUTTON) {
         flags |= GTK_STATE_FLAG_ACTIVE;
     }
@@ -1532,23 +1624,31 @@ static void gtk3_paint_box(WidgetType widget_type, GtkStateType state_type,
         fp_gtk_style_context_add_class (context, "default");
     }
 
-    fp_gtk_style_context_set_state (context, flags);
-
-    if (fp_gtk_style_context_has_class(context, "progressbar")) {
-        fp_gtk_render_activity (context, cr, x, y, width, height);
-    } else {
-        fp_gtk_render_background (context, cr, x, y, width, height);
-        if (shadow_type != GTK_SHADOW_NONE) {
-            fp_gtk_render_frame(context, cr, x, y, width, height);
-        }
+    if (fp_gtk_style_context_has_class(context, "trough")) {
+        flags |= GTK_STATE_FLAG_BACKDROP;
     }
 
-    fp_gtk_style_context_restore (context);
+    fp_gtk_style_context_set_state (context, flags);
+
+    fp_gtk_render_background (context, cr, x, y, width, height);
+    if (shadow_type != GTK_SHADOW_NONE) {
+        fp_gtk_render_frame(context, cr, x, y, width, height);
+    }
+
+    disposeOrRestoreContext(context);
+
     /*
      * Reset the text direction to the default value so that we don't
      * accidentally affect other operations and widgets.
      */
     gtk3_set_direction(gtk3_widget, GTK_TEXT_DIR_LTR);
+
+    //This is a fast solution to the scrollbar trough not being rendered properly
+    if ((widget_type == HSCROLL_BAR || widget_type == HSCROLL_BAR_TRACK ||
+        widget_type == VSCROLL_BAR || widget_type == VSCROLL_BAR_TRACK) && detail != 0) {
+        gtk3_paint_box(widget_type, state_type, shadow_type, NULL,
+                    x, y, width, height, synth_state, dir);
+    }
 }
 
 static void gtk3_paint_box_gap(WidgetType widget_type, GtkStateType state_type,
@@ -1580,23 +1680,19 @@ static void gtk3_paint_box_gap(WidgetType widget_type, GtkStateType state_type,
 static void gtk3_paint_check(WidgetType widget_type, gint synth_state,
         const gchar *detail, gint x, gint y, gint width, gint height)
 {
-    gtk3_widget = gtk3_get_widget(widget_type);
-
-    GtkStyleContext* context = fp_gtk_widget_get_style_context (gtk3_widget);
-
-    fp_gtk_style_context_save (context);
+    GtkStyleContext* context = get_style(widget_type, detail);
 
     GtkStateFlags flags = get_gtk_state_flags(synth_state);
     if (gtk3_version_3_14 && (synth_state & SELECTED)) {
-        flags = GTK_STATE_FLAG_CHECKED;
+        flags &= ~GTK_STATE_FLAG_SELECTED;
+        flags |= GTK_STATE_FLAG_CHECKED;
     }
     fp_gtk_style_context_set_state(context, flags);
 
-    fp_gtk_style_context_add_class (context, "check");
-
-    fp_gtk_render_check (context, cr, x, y, width, height);
-
-    fp_gtk_style_context_restore (context);
+    fp_gtk_render_background(context, cr, x, y, width, height);
+    fp_gtk_render_frame(context, cr, x, y, width, height);
+    fp_gtk_render_check(context, cr, x, y, width, height);
+    disposeOrRestoreContext(context);
 }
 
 
@@ -1680,7 +1776,6 @@ static void gtk3_paint_flat_box(WidgetType widget_type, GtkStateType state_type,
     gtk3_widget = gtk3_get_widget(widget_type);
 
     GtkStyleContext* context = fp_gtk_widget_get_style_context (gtk3_widget);
-
     fp_gtk_style_context_save (context);
 
     if (detail != 0) {
@@ -1783,25 +1878,19 @@ static void gtk3_paint_vline(WidgetType widget_type, GtkStateType state_type,
 static void gtk3_paint_option(WidgetType widget_type, gint synth_state,
         const gchar *detail, gint x, gint y, gint width, gint height)
 {
-     gtk3_widget = gtk3_get_widget(widget_type);
-
-     GtkStyleContext* context = fp_gtk_widget_get_style_context (gtk3_widget);
-
-     fp_gtk_style_context_save (context);
+     GtkStyleContext* context = get_style(widget_type, detail);
 
      GtkStateFlags flags = get_gtk_state_flags(synth_state);
      if (gtk3_version_3_14 && (synth_state & SELECTED)) {
-         flags = GTK_STATE_FLAG_CHECKED;
+         flags &= ~GTK_STATE_FLAG_SELECTED;
+         flags |= GTK_STATE_FLAG_CHECKED;
      }
      fp_gtk_style_context_set_state(context, flags);
 
-     if (detail != 0) {
-         transform_detail_string(detail, context);
-     }
-
+     fp_gtk_render_background(context, cr, x, y, width, height);
+     fp_gtk_render_frame(context, cr, x, y, width, height);
      fp_gtk_render_option(context, cr, x, y, width, height);
-
-     fp_gtk_style_context_restore (context);
+     disposeOrRestoreContext(context);
 }
 
 static void gtk3_paint_shadow(WidgetType widget_type, GtkStateType state_type,
@@ -1860,15 +1949,7 @@ static void gtk3_paint_slider(WidgetType widget_type, GtkStateType state_type,
         gint x, gint y, gint width, gint height, GtkOrientation orientation,
         gboolean has_focus)
 {
-    gtk3_widget = gtk3_get_widget(widget_type);
-
-    GtkStyleContext* context = fp_gtk_widget_get_style_context (gtk3_widget);
-
-    fp_gtk_style_context_save (context);
-
-    if (detail) {
-       transform_detail_string(detail, context);
-    }
+    GtkStyleContext *context = get_style(widget_type, detail);
 
     GtkStateFlags flags = get_gtk_flags(state_type);
 
@@ -1882,9 +1963,10 @@ static void gtk3_paint_slider(WidgetType widget_type, GtkStateType state_type,
 
     fp_gtk_style_context_set_state (context, flags);
 
+    fp_gtk_render_background (context, cr, x, y, width, height);
+    fp_gtk_render_frame(context, cr, x, y, width, height);
     (*fp_gtk_render_slider)(context, cr, x, y, width, height, orientation);
-
-    fp_gtk_style_context_restore (context);
+    disposeOrRestoreContext(context);
 }
 
 static void gtk3_paint_background(WidgetType widget_type,

src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.h

@@ -162,6 +162,7 @@ typedef void GtkAdjustment;
 typedef void GtkRange;
 typedef void GtkProgressBar;
 typedef void GtkProgress;
+typedef void GtkWidgetPath;
 
 /* Some real structures */
 typedef struct
@@ -238,7 +239,6 @@ typedef struct {
   GType    owner_type;
 } GParamSpec;
 
-
 static gchar* (*fp_glib_check_version)(guint required_major,
                            guint required_minor, guint required_micro);
 
@@ -573,5 +573,18 @@ static void (*fp_gtk_arrow_set)(GtkWidget* arrow,
 static void (*fp_gtk_widget_size_request)(GtkWidget *widget,
                                           GtkRequisition *requisition);
 static GtkAdjustment* (*fp_gtk_range_get_adjustment)(GtkRange* range);
+static GtkWidgetPath* (*fp_gtk_widget_path_copy)
+        (const GtkWidgetPath *path);
+static const GtkWidgetPath* (*fp_gtk_style_context_get_path)
+        (GtkStyleContext *context);
+static GtkWidgetPath* (*fp_gtk_widget_path_new) (void);
+static gint (*fp_gtk_widget_path_append_type)
+        (GtkWidgetPath *path, GType type);
+static void (*fp_gtk_widget_path_iter_set_object_name)
+        (GtkWidgetPath *path, gint pos, const char *name);
+static void (*fp_gtk_style_context_set_path)
+        (GtkStyleContext *context, GtkWidgetPath *path);
+static void (*fp_gtk_widget_path_unref) (GtkWidgetPath *path);
+static GtkStyleContext* (*fp_gtk_style_context_new) (void);
 
 #endif /* !_GTK3_INTERFACE_H */

src/java.desktop/unix/native/libawt_xawt/xawt/XToolkit.c

@@ -150,6 +150,10 @@ JNIEXPORT jint JNICALL
 DEF_JNI_OnLoad(JavaVM *vm, void *reserved)
 {
     jvm = vm;
+
+    //Set the gtk backend to x11 on all the systems
+    putenv("GDK_BACKEND=x11");
+
     return JNI_VERSION_1_2;
 }
 

src/java.desktop/windows/native/libawt/windows/awt.h

@@ -54,6 +54,7 @@ typedef enum _PROCESS_DPI_AWARENESS {
 
 //#ifndef _WIN32_WINNT_WIN10
 typedef BOOL(WINAPI EnableNonClientDpiScalingFunc)(HWND);
+typedef BOOL(WINAPI AdjustWindowRectExForDpiFunc)(LPRECT, DWORD, BOOL, DWORD, UINT);
 //#endif
 
 class AwtObject;

src/java.desktop/windows/native/libawt/windows/awt_DesktopProperties.cpp

@@ -37,6 +37,7 @@
 #include <shlobj.h>
 
 #include "math.h"
+#include <dwmapi.h>
 
 #if defined(_MSC_VER) && _MSC_VER >= 1800
 #  define ROUND_TO_INT(num)    ((int) round(num))
@@ -516,6 +517,16 @@ void AwtDesktopProperties::GetColorParameters() {
     SetColorProperty(TEXT("win.frame.activeCaptionColor"), GetSysColor(COLOR_ACTIVECAPTION));
     SetColorProperty(TEXT("win.frame.activeBorderColor"), GetSysColor(COLOR_ACTIVEBORDER));
 
+    BOOL enabled;
+    DwmIsCompositionEnabled(&enabled);
+    if (enabled) {
+        DWORD color;
+        BOOL opaque = FALSE;
+        // [tav] todo: listen WM_DWMCOLORIZATIONCOLORCHANGED
+        DwmGetColorizationColor(&color, &opaque);
+        SetColorProperty(TEXT("win.dwm.colorizationColor"), RGB(GetBValue(color), GetGValue(color), GetRValue(color)));
+    }
+
     // ?? ?? ??
     SetColorProperty(TEXT("win.frame.color"), GetSysColor(COLOR_WINDOWFRAME)); // ?? WHAT THE HECK DOES THIS MEAN ??
     // ?? ?? ??

src/java.desktop/windows/native/libawt/windows/awt_FileDialog.cpp

@@ -58,13 +58,7 @@ class CoTaskStringHolder {
 public:
     CoTaskStringHolder() : m_str(NULL) {}
 
-    CoTaskStringHolder(CoTaskStringHolder& other) {
-        m_str = other.m_str;
-        other.m_str = NULL;
-    }
-
     CoTaskStringHolder& operator=(CoTaskStringHolder& other) {
-        if (m_str == other.m_str) return *this;
         Clean();
         m_str = other.m_str;
         other.m_str = NULL;
@@ -90,10 +84,8 @@ private:
     LPTSTR m_str;
 
     void Clean() {
-        if (m_str) {
+        if (m_str)
             ::CoTaskMemFree(m_str);
-            m_str = NULL;
-        }
     }
 };
 
@@ -105,7 +97,6 @@ public:
     SmartHolderBase& operator=(const SmartHolderBase&) = delete;
 
     void Attach(T* other) {
-        if (m_pointer == other) return;
         Clean();
         m_pointer = other;
     }
@@ -125,10 +116,8 @@ protected:
     T* m_pointer;
 
     virtual void Clean() {
-        if (m_pointer) {
+        if (m_pointer)
             delete m_pointer;
-            m_pointer = NULL;
-        }
     }
 };
 
@@ -139,10 +128,8 @@ class SmartHolder : public SmartHolderBase<T> {
 template <typename T>
 class SmartHolder<T[]> : public SmartHolderBase<T> {
     virtual void Clean() {
-        if (m_pointer) {
+        if (m_pointer)
             delete [] m_pointer;
-            m_pointer = NULL;
-        }
     }
 };
 
@@ -538,9 +525,10 @@ private:
         HWND hdlg;
         OLE_HRT(pWindow->GetWindow(&hdlg));
 
+        HWND parent = ::GetParent(hdlg);
         jobject peer = data->peer;
-        env->CallVoidMethod(peer, AwtFileDialog::setHWndMID, (jlong)hdlg);
-        ::SetProp(hdlg, ModalDialogPeerProp, reinterpret_cast<HANDLE>(peer));
+        env->CallVoidMethod(peer, AwtFileDialog::setHWndMID, (jlong)parent);
+        ::SetProp(parent, ModalDialogPeerProp, reinterpret_cast<HANDLE>(peer));
 
         // fix for 4508670 - disable CS_SAVEBITS
         DWORD style = ::GetClassLong(hdlg, GCL_STYLE);
@@ -549,13 +537,13 @@ private:
         // set appropriate icon for parentless dialogs
         jobject awtParent = env->GetObjectField(peer, AwtFileDialog::parentID);
         if (awtParent == NULL) {
-            ::SendMessage(hdlg, WM_SETICON, (WPARAM)ICON_BIG,
+            ::SendMessage(parent, WM_SETICON, (WPARAM)ICON_BIG,
                           (LPARAM)AwtToolkit::GetInstance().GetAwtIcon());
         } else {
             AwtWindow *awtWindow = (AwtWindow *)JNI_GET_PDATA(awtParent);
-            ::SendMessage(hdlg, WM_SETICON, (WPARAM)ICON_BIG,
+            ::SendMessage(parent, WM_SETICON, (WPARAM)ICON_BIG,
                           (LPARAM)(awtWindow->GetHIcon()));
-            ::SendMessage(hdlg, WM_SETICON, (WPARAM)ICON_SMALL,
+            ::SendMessage(parent, WM_SETICON, (WPARAM)ICON_SMALL,
                           (LPARAM)(awtWindow->GetHIconSm()));
             env->DeleteLocalRef(awtParent);
         }
@@ -576,7 +564,7 @@ HRESULT CDialogEventHandler_CreateInstance(FileDialogData *data, REFIID riid, vo
     OLE_RETURN_HR
 }
 
-HRESULT CreateShellItem(LPTSTR path, IShellItemPtr& shellItem) {
+HRESULT CreateShellItem(LPTSTR path, IShellItem *shellItem) {
     size_t pathLength = _tcslen(path);
     for (size_t index = 0; index < pathLength; index++) {
         if (path[index] == _T('/'))
@@ -620,7 +608,7 @@ AwtFileDialog::Show(void *p)
     IFileDialogEventsPtr pfde;
     IShellItemPtr psiResult;
     FileDialogData data;
-    DWORD dwCookie = OLE_BAD_COOKIE;
+    DWORD dwCookie;
 
     OPENFILENAME ofn;
     memset(&ofn, 0, sizeof(ofn));
@@ -639,18 +627,6 @@ AwtFileDialog::Show(void *p)
         }
 //      DASSERT(awtParent);
         title = (jstring)(env)->GetObjectField(target, AwtDialog::titleID);
-        /*
-              Fix for 6488834.
-              To disable Win32 native parent modality we have to set
-              hwndOwner field to either NULL or some hidden window. For
-              parentless dialogs we use NULL to show them in the taskbar,
-              and for all other dialogs AwtToolkit's HWND is used.
-            */
-        /* [moklev] This fix does not needed anymore
-         * Tested on Windows 10 with example from JDK-4080029
-         * Revert the fix and set the proper parent to keep correct position of modal dialogs
-         */
-//        HWND hwndOwner = awtParent ? AwtToolkit::GetInstance().GetHWnd() : NULL;
         HWND hwndOwner = awtParent ? awtParent->GetHWnd() : NULL;
 
         if (title == NULL || env->GetStringLength(title)==0) {
@@ -691,7 +667,18 @@ AwtFileDialog::Show(void *p)
             ofn.lStructSize = sizeof(ofn);
             ofn.lpstrFilter = s_fileFilterString;
             ofn.nFilterIndex = 1;
-            ofn.hwndOwner = hwndOwner;
+            /*
+              Fix for 6488834.
+              To disable Win32 native parent modality we have to set
+              hwndOwner field to either NULL or some hidden window. For
+              parentless dialogs we use NULL to show them in the taskbar,
+              and for all other dialogs AwtToolkit's HWND is used.
+            */
+            if (awtParent != NULL) {
+                ofn.hwndOwner = AwtToolkit::GetInstance().GetHWnd();
+            } else {
+                ofn.hwndOwner = NULL;
+            }
             ofn.lpstrFile = fileBuffer;
             ofn.nMaxFile = bufferLimit;
             ofn.lpstrTitle = titleBuffer;
@@ -742,29 +729,20 @@ AwtFileDialog::Show(void *p)
             OLE_HRT(pfd->SetFileTypes(s_fileFilterCount, s_fileFilterSpec));
             OLE_HRT(pfd->SetFileTypeIndex(1));
 
-            {
-                IShellItemPtr directoryItem;
-                OLE_TRY
-                OLE_HRT(CreateShellItem(directoryBuffer, directoryItem));
-                OLE_HRT(pfd->SetFolder(directoryItem));
-                OLE_CATCH
+            IShellItemPtr directoryItem;
+            if (SUCCEEDED(CreateShellItem(directoryBuffer, directoryItem))) {
+                pfd->SetFolder(directoryItem);
             }
-
-            {
-                CoTaskStringHolder shortName = GetShortName(fileBuffer);
-                if (shortName) {
-                    OLE_TRY
-                    OLE_HRT(pfd->SetFileName(shortName));
-                    OLE_CATCH
-                }
+            CoTaskStringHolder shortName = GetShortName(fileBuffer);
+            if (shortName) {
+                OLE_HRT(pfd->SetFileName(shortName));
             }
-
             OLE_CATCH
         }
 
         if (useCommonItemDialog && SUCCEEDED(OLE_HR)) {
             if (mode == java_awt_FileDialog_LOAD) {
-                result = SUCCEEDED(pfd->Show(hwndOwner)) && data.result;
+                result = SUCCEEDED(pfd->Show(NULL)) && data.result;
                 if (!result) {
                     OLE_NEXT_TRY
                     OLE_HRT(pfd->GetResult(&psiResult));
@@ -777,7 +755,7 @@ AwtFileDialog::Show(void *p)
                     result = SUCCEEDED(OLE_HR);
                 }
             } else {
-                result = SUCCEEDED(pfd->Show(hwndOwner));
+                result = SUCCEEDED(pfd->Show(NULL));
                 if (result) {
                     OLE_NEXT_TRY
                     OLE_HRT(pfd->GetResult(&psiResult));
@@ -819,7 +797,7 @@ AwtFileDialog::Show(void *p)
 
         AwtDialog::ModalActivateNextWindow(NULL, target, peer);
 
-        if (!useCommonItemDialog) {
+        if (useCommonItemDialog) {
             VERIFY(::SetCurrentDirectory(currentDirectory));
         }
 
@@ -853,7 +831,7 @@ AwtFileDialog::Show(void *p)
     } catch (...) {
 
         if (useCommonItemDialog) {
-            if (pfd && dwCookie != OLE_BAD_COOKIE) {
+            if (pfd) {
                 pfd->Unadvise(dwCookie);
             }
         }
@@ -873,7 +851,7 @@ AwtFileDialog::Show(void *p)
     }
 
     if (useCommonItemDialog) {
-        if (pfd && dwCookie != OLE_BAD_COOKIE) {
+        if (pfd) {
             pfd->Unadvise(dwCookie);
         }
     }

src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp

@@ -1710,23 +1710,27 @@ BOOL AwtFrame::HasCustomDecoration()
     return *m_pHasCustomDecoration;
 }
 
-void GetSysInsets(RECT* insets) {
-    static RECT* sysInsets = NULL;
-
-    if (!sysInsets) {
-        sysInsets = new RECT;
-        sysInsets->left = sysInsets->right = ::GetSystemMetrics(SM_CXSIZEFRAME);
-        sysInsets->top = sysInsets->bottom = ::GetSystemMetrics(SM_CYSIZEFRAME);
-        sysInsets->top += ::GetSystemMetrics(SM_CYCAPTION);
+void GetSysInsets(RECT* insets, AwtFrame* pFrame) {
+    if (pFrame->IsUndecorated()) {
+        ::SetRectEmpty(insets);
+        return;
     }
-    ::CopyRect(insets, sysInsets);
+    Devices::InstanceAccess devices;
+    AwtWin32GraphicsDevice* device = devices->GetDevice(AwtWin32GraphicsDevice::DeviceIndexForWindow(pFrame->GetHWnd()));
+    int dpi = device ? device->GetScaleX() * 96 : 96;
+
+    // GetSystemMetricsForDpi gives incorrect values, use AdjustWindowRectExForDpi for border metrics instead
+    RECT rect = {0};
+    DWORD style = pFrame->IsResizable() ? WS_OVERLAPPEDWINDOW : WS_OVERLAPPEDWINDOW & ~WS_THICKFRAME;
+    AwtToolkit::AdjustWindowRectExForDpi(&rect, style, FALSE, NULL, dpi);
+    ::SetRect(insets, -rect.left, -rect.top, rect.right, rect.bottom);
 }
 
 LRESULT HitTestNCA(AwtFrame* frame, int x, int y) {
     RECT rcWindow;
     RECT insets;
 
-    GetSysInsets(&insets);
+    GetSysInsets(&insets, frame);
     GetWindowRect(frame->GetHWnd(), &rcWindow);
 
     // Get the frame rectangle, adjusted for the style without a caption.
@@ -1779,17 +1783,24 @@ MsgRouting AwtFrame::WmNcCalcSize(BOOL wParam, LPNCCALCSIZE_PARAMS lpncsp, LRESU
     if (!wParam || !HasCustomDecoration()) {
         return AwtWindow::WmNcCalcSize(wParam, lpncsp, retVal);
     }
-    if (::IsZoomed(GetHWnd())) {
-        RECT insets;
-        GetSysInsets(&insets);
-        static int xBorder = ::GetSystemMetrics(SM_CXBORDER);
-        static int yBorder = ::GetSystemMetrics(SM_CYBORDER);
+    RECT insets;
+    GetSysInsets(&insets, this);
+    RECT* rect = &lpncsp->rgrc[0];
 
-        // When maximized we should include insets or otherwise the client area edges get out of a screen
-        lpncsp->rgrc[0].left = lpncsp->rgrc[0].left + insets.left - xBorder;
-        lpncsp->rgrc[0].top = lpncsp->rgrc[0].top + insets.bottom - yBorder; // do not count caption
-        lpncsp->rgrc[0].right = lpncsp->rgrc[0].right - insets.right + xBorder;
-        lpncsp->rgrc[0].bottom = lpncsp->rgrc[0].bottom - insets.bottom + yBorder;
+    rect->left += insets.left;
+    rect->right -= insets.right;
+    rect->bottom -= insets.bottom;
+
+    if (::IsZoomed(GetHWnd())) {
+        rect->top += insets.bottom;
+        // [moklev] Workaround for RIDER-27069, IDEA-211327
+        rect->right += this->ScaleUpX(1);
+        rect->bottom -= 1;
+    }
+    else {
+        // this makes the native caption go uncovered
+        // int yBorder = ::GetSystemMetrics(SM_CYBORDER);
+        // rect->top += yBorder;
     }
     retVal = 0L;
     return mrConsume;

src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp

@@ -142,6 +142,7 @@ extern "C" JNIEXPORT jboolean JNICALL AWTIsHeadless() {
 #define IDT_AWT_MOUSECHECK 0x101
 
 EnableNonClientDpiScalingFunc* AwtToolkit::lpEnableNonClientDpiScaling = NULL;
+AdjustWindowRectExForDpiFunc* AwtToolkit::lpAdjustWindowRectExForDpi = NULL;
 
 static LPCTSTR szAwtToolkitClassName = TEXT("SunAwtToolkit");
 
@@ -674,8 +675,8 @@ BOOL AwtToolkit::Initialize(BOOL localPump) {
 
     HMODULE hLibUser32Dll = JDK_LoadSystemLibrary("User32.dll");
     if (hLibUser32Dll != NULL) {
-        lpEnableNonClientDpiScaling =
-                (EnableNonClientDpiScalingFunc*)GetProcAddress(hLibUser32Dll, "EnableNonClientDpiScaling");
+        lpEnableNonClientDpiScaling = (EnableNonClientDpiScalingFunc*)GetProcAddress(hLibUser32Dll, "EnableNonClientDpiScaling");
+        lpAdjustWindowRectExForDpi = (AdjustWindowRectExForDpiFunc*)GetProcAddress(hLibUser32Dll, "AdjustWindowRectExForDpi");
         ::FreeLibrary(hLibUser32Dll);
     }
 

src/java.desktop/windows/native/libawt/windows/awt_Toolkit.h

@@ -447,6 +447,12 @@ public:
         return lpEnableNonClientDpiScaling != NULL ? lpEnableNonClientDpiScaling(hwnd) : FALSE;
     }
 
+    static INLINE BOOL AdjustWindowRectExForDpi(LPRECT lpRect, DWORD dwStyle, BOOL bMenu, DWORD dwExStyle, UINT dpi)
+    {
+        return lpAdjustWindowRectExForDpi != NULL ?
+            lpAdjustWindowRectExForDpi(lpRect, dwStyle, bMenu, dwExStyle, dpi) : ::AdjustWindowRectEx(lpRect, dwStyle, bMenu, dwExStyle);
+    }
+
     HANDLE m_waitEvent;
     volatile DWORD eventNumber;
     volatile BOOL isInDoDragDropLoop;
@@ -510,6 +516,7 @@ private:
     CriticalSection m_Sync;
 
     static EnableNonClientDpiScalingFunc *lpEnableNonClientDpiScaling;
+    static AdjustWindowRectExForDpiFunc *lpAdjustWindowRectExForDpi;
 
 /* track display changes - used by palette-updating code.
    This is a workaround for a windows bug that prevents

src/java.desktop/windows/native/libawt/windows/awt_Window.cpp

@@ -1404,7 +1404,19 @@ void AwtWindow::Show()
             if (nCmdShow == SW_SHOWNA) {
                 flags |= SWP_NOACTIVATE;
             }
-            ::SetWindowPos(GetHWnd(), HWND_TOPMOST, 0, 0, 0, 0, flags);
+            // This flag allows the toplevel to be bellow other process toplevels.
+            // This behaviour is preferable for popups, but it is not appropriate
+            // for menus
+            BOOL isLightweightDialog = TRUE;
+            jclass windowPeerClass = env->FindClass("java/awt/peer/WindowPeer");
+            if (windowPeerClass != NULL) {
+                jmethodID isLightweightDialogMID = env->GetStaticMethodID(windowPeerClass, "isLightweightDialog", "(Ljava/awt/Window;)Z");
+                if (isLightweightDialogMID != NULL) {
+                    isLightweightDialog = env->CallStaticBooleanMethod(windowPeerClass, isLightweightDialogMID, target);
+                }
+            }
+
+            ::SetWindowPos(GetHWnd(), isLightweightDialog ? HWND_TOP : HWND_TOPMOST, 0, 0, 0, 0, flags);
         } else {
             ::ShowWindow(GetHWnd(), nCmdShow);
         }

src/jdk.attach/aix/classes/sun/tools/attach/VirtualMachineImpl.java

@@ -265,15 +265,18 @@ public class VirtualMachineImpl extends HotSpotVirtualMachine {
     // checks for the file.
     private File createAttachFile(int pid) throws IOException {
         String fn = ".attach_pid" + pid;
-        String path = "/proc/" + pid + "/cwd/" + fn;
-        File f = new File(path);
-        try {
-            f = f.getCanonicalFile();
-            f.createNewFile();
-        } catch (IOException x) {
-            f = new File(tmpdir, fn);
-            f.createNewFile();
+        if (!attachOnlyInTmp()) {
+            String path = "/proc/" + pid + "/cwd/" + fn;
+            File f = new File(path);
+            try {
+                f = f.getCanonicalFile();
+                f.createNewFile();
+                return f;
+            } catch (IOException x) {
+            }
         }
+        File f = new File(tmpdir, fn);
+        f.createNewFile();
         return f;
     }
 

src/jdk.attach/linux/classes/sun/tools/attach/VirtualMachineImpl.java

@@ -280,25 +280,28 @@ public class VirtualMachineImpl extends HotSpotVirtualMachine {
     // checks for the file.
     private File createAttachFile(int pid, int ns_pid) throws IOException {
         String fn = ".attach_pid" + ns_pid;
-        String path = "/proc/" + pid + "/cwd/" + fn;
-        File f = new File(path);
-        try {
-            f = f.getCanonicalFile();
-            f.createNewFile();
-        } catch (IOException x) {
-            String root;
-            if (pid != ns_pid) {
-                // A process may not exist in the same mount namespace as the caller.
-                // Instead, attach relative to the target root filesystem as exposed by
-                // procfs regardless of namespaces.
-                root = "/proc/" + pid + "/root/" + tmpdir;
-            } else {
-                root = tmpdir;
+        if (!attachOnlyInTmp()) {
+            String path = "/proc/" + pid + "/cwd/" + fn;
+            File f = new File(path);
+            try {
+                f = f.getCanonicalFile();
+                f.createNewFile();
+                return f;
+            } catch (IOException x) {
             }
-            f = new File(root, fn);
-            f = f.getCanonicalFile();
-            f.createNewFile();
         }
+        String root;
+        if (pid != ns_pid) {
+            // A process may not exist in the same mount namespace as the caller.
+            // Instead, attach relative to the target root filesystem as exposed by
+            // procfs regardless of namespaces.
+            root = "/proc/" + pid + "/root/" + tmpdir;
+        } else {
+            root = tmpdir;
+        }
+        File f = new File(root, fn);
+        f = f.getCanonicalFile();
+        f.createNewFile();
         return f;
     }
 

src/jdk.attach/share/classes/sun/tools/attach/HotSpotVirtualMachine.java

@@ -392,4 +392,12 @@ public abstract class HotSpotVirtualMachine extends VirtualMachine {
         }
         return attachTimeout;
     }
+
+    boolean attachOnlyInTmp() {
+        try {
+            return Boolean.getBoolean("sun.tools.attach.tmp.only");
+        } catch (Exception e) {
+            return false;
+        }
+    }
 }

src/jdk.attach/solaris/classes/sun/tools/attach/VirtualMachineImpl.java

@@ -231,15 +231,18 @@ public class VirtualMachineImpl extends HotSpotVirtualMachine {
     // handler checks for the file.
     private File createAttachFile(int pid) throws IOException {
         String fn = ".attach_pid" + pid;
-        String path = "/proc/" + pid + "/cwd/" + fn;
-        File f = new File(path);
-        try {
-            f = f.getCanonicalFile();
-            f.createNewFile();
-        } catch (IOException x) {
-            f = new File(tmpdir, fn);
-            f.createNewFile();
+        if (!attachOnlyInTmp()) {
+            String path = "/proc/" + pid + "/cwd/" + fn;
+            File f = new File(path);
+            try {
+                f = f.getCanonicalFile();
+                f.createNewFile();
+                return f;
+            } catch (IOException x) {
+            }
         }
+        File f = new File(tmpdir, fn);
+        f.createNewFile();
         return f;
     }
 

src/jdk.jdi/share/classes/com/sun/tools/jdi/ArrayTypeImpl.java

@@ -90,27 +90,7 @@ public class ArrayTypeImpl extends ReferenceTypeImpl
      * this method is sometimes needed for proper type checking.
      */
     Type findComponentType(String signature) throws ClassNotLoadedException {
-        byte tag = (byte)signature.charAt(0);
-        if (PacketStream.isObjectTag(tag)) {
-            // It's a reference type
-            JNITypeParser parser = new JNITypeParser(componentSignature());
-            List<ReferenceType> list = vm.classesByName(parser.typeName());
-            Iterator<ReferenceType> iter = list.iterator();
-            while (iter.hasNext()) {
-                ReferenceType type = iter.next();
-                ClassLoaderReference cl = type.classLoader();
-                if ((cl == null)?
-                         (classLoader() == null) :
-                         (cl.equals(classLoader()))) {
-                    return type;
-                }
-            }
-            // Component class has not yet been loaded
-            throw new ClassNotLoadedException(componentTypeName());
-        } else {
-            // It's a primitive type
-            return vm.primitiveTypeMirror(tag);
-        }
+        return findType(signature);
     }
 
     public Type componentType() throws ClassNotLoadedException {

src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java

@@ -33,10 +33,11 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.TreeSet;
+import java.util.Set;
 
 import com.sun.jdi.BooleanType;
 import com.sun.jdi.BooleanValue;
@@ -110,7 +111,7 @@ class VirtualMachineImpl extends MirrorImpl
     // tested unsynchronized (since once true, it stays true), but must
     // be set synchronously
     private Map<Long, ReferenceType> typesByID;
-    private TreeSet<ReferenceType> typesBySignature;
+    private Set<ReferenceType> typesBySignature;
     private boolean retrievedAllTypes = false;
 
     private Map<Long, ModuleReference> modulesByID;
@@ -843,14 +844,9 @@ class VirtualMachineImpl extends MirrorImpl
                 throw new InternalException("Invalid reference type tag");
         }
 
-        /*
-         * If a signature was specified, make sure to set it ASAP, to
-         * prevent any needless JDWP command to retrieve it. (for example,
-         * typesBySignature.add needs the signature, to maintain proper
-         * ordering.
-         */
-        if (signature != null) {
-            type.setSignature(signature);
+        if (signature == null && retrievedAllTypes) {
+            // do not cache if signature is not provided
+            return type;
         }
 
         typesByID.put(id, type);
@@ -920,7 +916,7 @@ class VirtualMachineImpl extends MirrorImpl
 
     private void initReferenceTypes() {
         typesByID = new HashMap<>(300);
-        typesBySignature = new TreeSet<>();
+        typesBySignature = new HashSet<>();
     }
 
     ReferenceTypeImpl referenceType(long ref, byte tag) {
@@ -969,6 +965,9 @@ class VirtualMachineImpl extends MirrorImpl
                 if (retType == null) {
                     retType = addReferenceType(id, tag, signature);
                 }
+                if (signature != null) {
+                    retType.setSignature(signature);
+                }
             }
             return retType;
         }

test/hotspot/jtreg/jbProblemList.txt

@@ -172,30 +172,32 @@ vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses023/TestDescrip
 vmTestbase/nsk/jdi/VirtualMachine/suspend/suspend001/TestDescription.java           8207367 linux-all,macosx-all
 vmTestbase/nsk/jdi/stress/ClassPrepareEvents/ClassPrepareEvents001/ClassPrepareEvents001.java 6426321 generic-all
 
-vmTestbase/metaspace/gc/firstGC_10m/TestDescription.java 8208250 generic-all
-vmTestbase/metaspace/gc/firstGC_50m/TestDescription.java 8208250 generic-all
-vmTestbase/metaspace/gc/firstGC_99m/TestDescription.java 8208250 generic-all
-vmTestbase/metaspace/gc/firstGC_default/TestDescription.java 8208250 generic-all
+vmTestbase/metaspace/gc/firstGC_10m/TestDescription.java                            8208250 generic-all
+vmTestbase/metaspace/gc/firstGC_50m/TestDescription.java                            8208250 generic-all
+vmTestbase/metaspace/gc/firstGC_99m/TestDescription.java                            8208250 generic-all
+vmTestbase/metaspace/gc/firstGC_default/TestDescription.java                        8208250 generic-all
 
-vmTestbase/nsk/jvmti/ClearBreakpoint/clrbrk001/TestDescription.java 8016181 generic-all
-vmTestbase/nsk/jvmti/FieldModification/fieldmod001/TestDescription.java 8016181 generic-all
+vmTestbase/nsk/jvmti/ClearBreakpoint/clrbrk001/TestDescription.java                 8016181 generic-all
+vmTestbase/nsk/jvmti/FieldModification/fieldmod001/TestDescription.java             8016181 generic-all
 vmTestbase/nsk/jvmti/RedefineClasses/StressRedefineWithoutBytecodeCorruption/TestDescription.java 8202896,8206076,8208074 generic-all
-vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted001/TestDescription.java 7013634 generic-all
-vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted003/TestDescription.java 6606767 generic-all
-vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted004/TestDescription.java 7013634,6606767 generic-all
-vmTestbase/nsk/jvmti/ThreadStart/threadstart001/TestDescription.java 8016181 generic-all
-vmTestbase/nsk/jvmti/ThreadStart/threadstart003/TestDescription.java 8034084 generic-all
-vmTestbase/nsk/jvmti/scenarios/extension/EX03/ex03t001/TestDescription.java 8173658 generic-all
-vmTestbase/nsk/jvmti/scenarios/hotswap/HS102/hs102t002/TestDescription.java 8204506,8203350 generic-all
-vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t001/hs204t001.java 6813266 generic-all
-vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t003/TestDescription.java 8051349 generic-all
-vmTestbase/nsk/jvmti/AttachOnDemand/attach034/TestDescription.java 8042145 generic-all
-vmTestbase/nsk/jvmti/AttachOnDemand/attach045/TestDescription.java 8202971 generic-all
-vmTestbase/nsk/jvmti/unit/heap/HeapWalkTests/TestDescription.java 8016181 generic-all
-vmTestbase/nsk/jvmti/IterateThroughHeap/filter-tagged/TestDescription.java 8201513 generic-all
-vmTestbase/nsk/jvmti/IterateThroughHeap/filter-class-untagged/TestDescription.java 8201513 generic-all
-vmTestbase/nsk/jvmti/IterateThroughHeap/filter-class-tagged/TestDescription.java 8201513 generic-all
-vmTestbase/nsk/jvmti/IterateThroughHeap/filter-untagged/TestDescription.java 8201513 generic-all
+vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted001/TestDescription.java         7013634 generic-all
+vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted003/TestDescription.java         6606767 generic-all
+vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted004/TestDescription.java         7013634,6606767 generic-all
+vmTestbase/nsk/jvmti/ThreadStart/threadstart001/TestDescription.java                8016181 generic-all
+vmTestbase/nsk/jvmti/ThreadStart/threadstart003/TestDescription.java                8034084 generic-all
+vmTestbase/nsk/jvmti/scenarios/extension/EX03/ex03t001/TestDescription.java         8173658 generic-all
+vmTestbase/nsk/jvmti/scenarios/hotswap/HS102/hs102t002/TestDescription.java         8204506,8203350 generic-all
+vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t001/hs204t001.java               6813266 generic-all
+vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t003/TestDescription.java          8051349 generic-all
+vmTestbase/nsk/jvmti/AttachOnDemand/attach034/TestDescription.java                  8042145 generic-all
+vmTestbase/nsk/jvmti/AttachOnDemand/attach045/TestDescription.java                  8202971 generic-all
+vmTestbase/nsk/jvmti/unit/heap/HeapWalkTests/TestDescription.java                   8016181 generic-all
+vmTestbase/nsk/jvmti/IterateThroughHeap/filter-tagged/TestDescription.java          8201513 generic-all
+vmTestbase/nsk/jvmti/IterateThroughHeap/filter-class-untagged/TestDescription.java  8201513 generic-all
+vmTestbase/nsk/jvmti/IterateThroughHeap/filter-class-tagged/TestDescription.java    8201513 generic-all
+vmTestbase/nsk/jvmti/IterateThroughHeap/filter-untagged/TestDescription.java        8201513 generic-all
+
+vmTestbase/nsk/sysdict/vm/stress/chain/chain007/chain007.java                       JRE-1282 macosx-10.13
 
 vmTestbase/gc/lock/jni/jnilock002/TestDescription.java 8208243,8192647 generic-all
 

test/jdk/jb/javax/swing/JDialog/JDialog1054.java

@@ -132,6 +132,9 @@ public class JDialog1054 {
             owner.setLocation(ownerLoc);
             owner.setSize(ownerDim);
             owner.setVisible(true);
+        };
+
+        final Runnable nonModalDialogRunner = () -> {
             nonModalDialog.setLocation(nonModalLoc);
             nonModalDialog.setSize(nonModalDim);
             nonModalDialog.getContentPane().add(nonModalDialogButton,  BorderLayout.CENTER);
@@ -165,6 +168,9 @@ public class JDialog1054 {
         try {
             System.out.println("Open owner frame and non-modal dialog");
             SwingUtilities.invokeLater(frameRunner);
+            // Wait for a while to improve the visibility of the test run
+            Thread.sleep(pause);
+            SwingUtilities.invokeLater(nonModalDialogRunner);
             if(!nonModalDialogGainedFocus.await(timeout, TimeUnit.MILLISECONDS)) {
                 throw new RuntimeException("Test ERROR: Cannot focus on non-modal dialog");
             }

test/jdk/jb/javax/swing/JDialog/JDialog186.java

@@ -37,7 +37,7 @@ import javax.swing.WindowConstants;
 
 public class JDialog186 {
 
-    private static JFrame frame = new JFrame("JDialog186");
+    private static JFrame frame = new JFrame("This frame is supposed to be shown first");
     private static JDialog dialog;
     private static Process process;
     static final Object lock = new Object();
@@ -45,11 +45,11 @@ public class JDialog186 {
     private static Runnable modalDialogThread = new Runnable() {
         @Override
         public void run() {
-            dialog = new JDialog(frame, true);
-            dialog.setTitle("Modal input");
+            dialog = new JDialog(frame, "This is a modal dialog, it is not supposed to steal the focus", true);
             dialog.getContentPane().add(new JTextArea());
             dialog.setLocation(new Point(20, 100));
             dialog.setSize(350, 100);
+            dialog.setAutoRequestFocus(false);
             dialog.setVisible(true);
         }
     };
@@ -90,12 +90,10 @@ public class JDialog186 {
 
             process.getErrorStream();
             String line;
-            BufferedReader input = new BufferedReader(new InputStreamReader(process.getErrorStream()));
-            try {
+            try (BufferedReader input = new BufferedReader(new InputStreamReader(process.getErrorStream()))) {
                 while ((line = input.readLine()) != null) {
                     System.out.println(line);
                 }
-                input.close();
             } catch (IOException e) {
                 e.printStackTrace();
             }
@@ -122,7 +120,6 @@ public class JDialog186 {
                 }
             }
 
-            System.out.println("launching helper");
             process = Runtime.getRuntime().exec(new String[]{javaExecutable, "-classpath",
                     System.getProperty("java.class.path"), "JDialog186Aux"});
             checkAuxProcess();
@@ -159,7 +156,7 @@ class JDialog186Aux {
         Robot robot = new Robot();
         robot.setAutoDelay(100);
 
-        JFrame frame = new JFrame("JDialog186Aux");
+        JFrame frame = new JFrame("This frame takes focus from the first frame");
         frame.addWindowFocusListener(focusListener);
         JEditorPane editorPane = new JEditorPane();
 

test/jdk/jb/sun/awt/macos/MoveFocusShortcutTest.java

@@ -45,10 +45,9 @@ public class MoveFocusShortcutTest {
 
     private static final int PAUSE = 2000;
 
-    private static TestFrame frame1;
-    private static TestFrame frame2;
-    private static TestFrame frame3;
+    private static final int framesCount = 3;
 
+    private static TestFrame[] frames;
     private static WindowAdapter frameFocusListener;
 
     private static Robot robot;
@@ -76,9 +75,7 @@ public class MoveFocusShortcutTest {
             throw new RuntimeException("ERROR: Cannot execute the test in headless environment");
         }
 
-        frame1 = new TestFrame("TestFrame1");
-        frame2 = new TestFrame("TestFrame2");
-        frame3 = new TestFrame("TestFrame3");
+        frames = new TestFrame[framesCount];
 
         frameFocusListener = new WindowAdapter() {
             @Override
@@ -99,67 +96,60 @@ public class MoveFocusShortcutTest {
             robot.setAutoDelay(50);
 
             System.out.println("Open test frames");
-            showGUI();
-
-            Thread.sleep(PAUSE);
-            robot.waitForIdle();
-
-            boolean check1 = (frame1.getLatch().getCount() == 1);
-            boolean check2 = (frame2.getLatch().getCount() == 1);
-            boolean check3 = (frame3.getLatch().getCount() == 1);
-
-            if (check1 && check2 && check3) {
-                System.out.println("All frames were opened");
-            } else {
-                throw new RuntimeException("Test ERROR: Cannot focus the TestFrame(s): "
-                        + getFailedChecksString(check1, check2, check3));
+            for(int i = 0; i < framesCount; i++) {
+                showFrame(i);
+                Thread.sleep(PAUSE);
+                robot.waitForIdle();
             }
 
-            moveFocusToNextWindow();
-            Thread.sleep(PAUSE);
-            robot.waitForIdle();
+            String check = "";
+            for(int i = 0; i < framesCount; i++) {
+                if(frames[i].getLatch().getCount() != 1) {
+                    check += check.isEmpty() ? i : (", " + i);
+                }
+            }
+            if (check.isEmpty()) {
+                System.out.println("All frames were opened");
+            } else {
+                throw new RuntimeException("Test ERROR: Cannot focus the TestFrame(s): " + check);
+            }
 
-            moveFocusToNextWindow();
-            Thread.sleep(PAUSE);
-            robot.waitForIdle();
+            for(int i = 0; i < framesCount; i++) {
+                moveFocusToNextWindow();
+                Thread.sleep(PAUSE);
+                robot.waitForIdle();
+            }
 
-            moveFocusToNextWindow();
-            Thread.sleep(PAUSE);
-            robot.waitForIdle();
-
-            boolean result1 = frame1.getLatch().await(PAUSE, TimeUnit.MILLISECONDS);
-            boolean result2 = frame2.getLatch().await(PAUSE, TimeUnit.MILLISECONDS);
-            boolean result3 = frame3.getLatch().await(PAUSE, TimeUnit.MILLISECONDS);
-
-            if(result1 && result2 && result3) {
+            String result = "";
+            for(int i = 0; i < framesCount; i++) {
+                if(!frames[i].getLatch().await(PAUSE, TimeUnit.MILLISECONDS)) {
+                    result += result.isEmpty() ? i : (", " + i);
+                }
+            }
+            if(result.isEmpty()) {
                 System.out.println("Test PASSED");
             } else {
                 throw new RuntimeException("Test FAILED: Command+` shortcut cannot move focus to the TestFrame(s): "
-                        + getFailedChecksString(result1 , result2 , result3));
+                        + result);
             }
         } finally {
-            destroyGUI();
+            for(int i = 0; i < framesCount; i++) {
+                destroyFrame(i);
+            }
             /* Waiting for EDT auto-shutdown */
             Thread.sleep(PAUSE);
         }
     }
 
     /*
-     * Opens test frames
+     * Opens a test frame
      */
-    private static void showGUI() {
-        frame1.setSize(400, 200);
-        frame2.setSize(400, 200);
-        frame3.setSize(400, 200);
-        frame1.setLocation(50, 50);
-        frame2.setLocation(100, 100);
-        frame3.setLocation(150, 150);
-        frame1.addWindowFocusListener(frameFocusListener);
-        frame2.addWindowFocusListener(frameFocusListener);
-        frame3.addWindowFocusListener(frameFocusListener);
-        frame1.setVisible(true);
-        frame2.setVisible(true);
-        frame3.setVisible(true);
+    private static void showFrame(int num) {
+        frames[num] = new TestFrame("TestFrame" + num);
+        frames[num].setSize(400, 200);
+        frames[num].setLocation(50*(num+1), 50*(num+1));
+        frames[num].addWindowFocusListener(frameFocusListener);
+        frames[num].setVisible(true);
     }
 
     /*
@@ -174,29 +164,12 @@ public class MoveFocusShortcutTest {
     }
 
     /*
-     * Returns string containing positions of the false values
+     * Disposes a test frame
      */
-    private static String getFailedChecksString(boolean ... values) {
-        int i = 0;
-        String result = "";
-        for (boolean value : values) {
-            i++;
-            if(!value) {
-                result += result.isEmpty() ? i : (", " + i);
-            }
+    private static void destroyFrame(int num) {
+        if(frames[num] != null) {
+            frames[num].removeWindowFocusListener(frameFocusListener);
+            frames[num].dispose();
         }
-        return result;
-    }
-
-    /*
-     * Disposes test frames
-     */
-    private static void destroyGUI() {
-        frame1.removeWindowFocusListener(frameFocusListener);
-        frame2.removeWindowFocusListener(frameFocusListener);
-        frame3.removeWindowFocusListener(frameFocusListener);
-        frame1.dispose();
-        frame2.dispose();
-        frame3.dispose();
     }
 }

test/jdk/jbProblemList.txt

@@ -121,11 +121,12 @@ java/awt/Choice/ChoiceGeneratesItemEvents/ChoiceGeneratesItemEvents.html
 java/awt/Choice/ChoiceKeyEventReaction/ChoiceKeyEventReaction.html                  6849922 macosx-all,windows-all
 java/awt/Choice/ChoiceMouseWheelTest/ChoiceMouseWheelTest.java                      7100044 macosx-all,windows-all
 java/awt/Choice/ChoicePopupLocation/ChoicePopupLocation.java                        8202931 macosx-all,linux-all,windows-all
-java/awt/Choice/GrabLockTest/GrabLockTest.java                                      JRE-839 windows-all,macosx-all
+java/awt/Choice/GrabLockTest/GrabLockTest.java                                      JRE-839 windows-all,macosx-all,linux-all
 java/awt/Choice/PopdownGeneratesMouseEvents/PopdownGeneratesMouseEvents.html        8194045 generic-all
 java/awt/Choice/PopupPosTest/PopupPosTest.html                                      8192930 windows-all
 java/awt/Choice/RemoveAllShrinkTest/RemoveAllShrinkTest.java                        8047703 generic-all
-java/awt/Choice/SelectCurrentItemTest/SelectCurrentItemTest.html                    8014503,8192929 windows-all,linux-all
+java/awt/Choice/SelectCurrentItemTest/SelectCurrentItemTest.html                    8014503,8192929 windows-all,macosx-all,linux-all
+java/awt/Clipboard/ClipboardSecurityTest/ClipboardSecurity.html                     8194045 generic-all
 java/awt/Clipboard/HTMLTransferTest/HTMLTransferTest.html                           8017454 macosx-all
 java/awt/Color/AlphaColorTest.java                                                  8211286 windows-all,macosx-all,linux-all
 java/awt/Component/CreateImage/CreateImage.java                                     8198334 windows-all
@@ -133,38 +134,38 @@ java/awt/Component/GetScreenLocTest/GetScreenLocTest.java
 java/awt/Component/NativeInLightShow/NativeInLightShow.java                         8202932 linux-all,macosx-all,windows-all
 java/awt/Component/PaintAll/PaintAll.java                                           8169104 windows-all
 java/awt/Component/SetEnabledPerformance/SetEnabledPerformance.java                 8165863 macosx-all
-java/awt/Debug/DumpOnKey/DumpOnKey.java                                             8202667 windows-all
+java/awt/Debug/DumpOnKey/DumpOnKey.java                                             8202667 windows-all,linux-all
 java/awt/Dialog/DialogAboveFrame/DialogAboveFrame.java                              8214923 windows-all,macosx-all
 java/awt/Dialog/DialogAboveFrame/DialogAboveFrameTest.java                          8215105 macosx-all,windows-all
 java/awt/EmbeddedFrame/EmbeddedFrameGrabTest/EmbeddedFrameGrabTest.java             8159069 windows-all
-java/awt/EventDispatchThread/HandleExceptionOnEDT/HandleExceptionOnEDT.java         8203047 macosx-all,windows-all
+java/awt/EventDispatchThread/HandleExceptionOnEDT/HandleExceptionOnEDT.java         8203047 macosx-all,linux-all,windows-all
 java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.html                     8073636 macosx-all
 java/awt/EventQueue/6980209/bug6980209.java                                         8198615 macosx-all,linux-all,windows-all
 java/awt/FileDialog/8003399/bug8003399.java                                         8198334 windows-all
 java/awt/FileDialog/FileDialogIconTest/FileDialogIconTest.java                      8160558 windows-all
 java/awt/FileDialog/FilenameFilterTest/FilenameFilterTest.html                      8202882 linux-all
 java/awt/FileDialog/ModalFocus/FileDialogModalFocusTest.java                        8194751 linux-all
-java/awt/Focus/8013611/JDK8013611.java                                              8175366 windows-all,macosx-all
-java/awt/Focus/6378278/InputVerifierTest.java                                       8198616,8047703 macosx-all,windows-all
+java/awt/Focus/8013611/JDK8013611.java                                              8175366,8213522 windows-all,macosx-all,linux-all
+java/awt/Focus/6378278/InputVerifierTest.java                                       8198616,8047703 macosx-all,linux-4.15,windows-all
 java/awt/Focus/6382144/EndlessLoopTest.java                                         8198617,8047703 generic-all
-java/awt/Focus/6401036/InputVerifierTest2.java                                      JRE-898 macosx-all
-java/awt/Focus/6981400/Test1.java                                                   8029675 windows-all,macosx-all
+java/awt/Focus/6401036/InputVerifierTest2.java                                      8047703 generic-all
+java/awt/Focus/6981400/Test1.java                                                   8029675 windows-all,linux-all,macosx-all
 java/awt/Focus/8073453/AWTFocusTransitionTest.java                                  8136517 generic-all
 java/awt/Focus/8073453/SwingFocusTransitionTest.java                                8136517,8197561,8213522 generic-all
 java/awt/Focus/6981400/Test3.java 8173264                                           generic-all
 java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowBlockingTest.java         8168408 windows-all,macosx-all,linux-all
 java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowRetaining.java            6829264 generic-all
-java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest.html                   JRE-898,6862004 macosx-all,linux-all
+java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest.html                   JRE-898,6862004 macosx-all,linux-all,windows-all
 java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusToFrontTest.java                6848406 generic-all
 java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusSetVisibleTest.java             6848407 generic-all
 java/awt/Focus/Cause/FocusCauseTest.java                                            JRE-898 macosx-all,windows-all (windows: commit testing)
 java/awt/Focus/ChildWindowFocusTest/ChildWindowFocusTest.html                       8047703 windows-all,macosx-all,linux-all
-java/awt/Focus/ChoiceFocus/ChoiceFocus.java                                         8169103 windows-all,macosx-all
+java/awt/Focus/ChoiceFocus/ChoiceFocus.java                                         8169103,8213522 windows-all,macosx-all,linux-all
 java/awt/Focus/ClearGlobalFocusOwnerTest/ClearGlobalFocusOwnerTest.java             JRE-898 macosx-all
-java/awt/Focus/ClearLwQueueBreakTest/ClearLwQueueBreakTest.java                     8198618 macosx-all,windows-all
+java/awt/Focus/ClearLwQueueBreakTest/ClearLwQueueBreakTest.java                     8198618,8213522 macosx-all,windows-all,linux-all
 java/awt/Focus/CloseDialogActivateOwnerTest/CloseDialogActivateOwnerTest.java       7124555 macosx-all,linux-all
 java/awt/Focus/ConsumeNextKeyTypedOnModalShowTest/ConsumeNextKeyTypedOnModalShowTest.java 6986252 macosx-all
-java/awt/Focus/DeiconifiedFrameLoosesFocus/DeiconifiedFrameLoosesFocus.html         8015886 macosx-all
+java/awt/Focus/DeiconifiedFrameLoosesFocus/DeiconifiedFrameLoosesFocus.html         8015886 macosx-all,linux-all
 java/awt/Focus/FocusOwnerFrameOnClick/FocusOwnerFrameOnClick.java                   8081489 generic-all
 java/awt/Focus/FocusSubRequestTest/FocusSubRequestTest.html                         JRE-898 macosx-all,windows-all
 java/awt/Focus/FocusTraversalPolicy/ButtonGroupLayoutTraversal/ButtonGroupLayoutTraversalTest.java 8198619,8213522 macosx-all,linux-all,windows-all
@@ -172,11 +173,12 @@ java/awt/Focus/FrameMinimizeTest/FrameMinimizeTest.java
 java/awt/Focus/IconifiedFrameFocusChangeTest/IconifiedFrameFocusChangeTest.java     6849364 generic-all
 java/awt/Focus/KeyEventForBadFocusOwnerTest/KeyEventForBadFocusOwnerTest.java       8198621,8213522 macosx-all,linux-all,windows-all
 java/awt/Focus/ModalDialogActivationTest/ModalDialogActivationTest.java             8165157 macosx-all
+java/awt/Focus/ModalExcludedWindowClickTest/ModalExcludedWindowClickTest.html       8164473 linux-all
 java/awt/Focus/MouseClickRequestFocusRaceTest/MouseClickRequestFocusRaceTest.java   8194753,8202921 linux-all,macosx-all,windows-all
 java/awt/Focus/NoAutotransferToDisabledCompTest/NoAutotransferToDisabledCompTest.java 7152980,8213522 macosx-all,linux-all,windows-all
 java/awt/Focus/NonFocusableBlockedOwnerTest/NonFocusableBlockedOwnerTest.html       7124275 macosx-all
 java/awt/Focus/NonFocusableWindowTest/NoEventsTest.java                             8000171 windows-all
-java/awt/Focus/OwnedWindowFocusIMECrashTest/OwnedWindowFocusIMECrashTest.java       8169110 macosx-all,windows-all
+java/awt/Focus/OwnedWindowFocusIMECrashTest/OwnedWindowFocusIMECrashTest.java       8169110 macosx-all,windows-all,linux-all
 java/awt/Focus/RequestFocusByCause/RequestFocusByCauseTest.java                     JRE-898 macosx-all,linux-all
 java/awt/Focus/RequestFocusToDisabledCompTest/RequestFocusToDisabledCompTest.java   JRE-898 macosx-all
 java/awt/Focus/ResetMostRecentFocusOwnerTest/ResetMostRecentFocusOwnerTest.java     8168294 macosx-all,windows-all,linux-all
@@ -187,11 +189,11 @@ java/awt/Focus/ToFrontFocusTest/ToFrontFocus.html
 java/awt/Focus/TranserFocusToWindow/TranserFocusToWindow.java                       6848810 macosx-all,linux-all,windows-all
 java/awt/Focus/TypeAhead/TestFocusFreeze.java                                       8198622,6447537,8213522 macosx-all,linux-all,windows-all
 java/awt/Focus/WindowInitialFocusTest/WindowInitialFocusTest.html                   8169100 windows-all,macosx-all
-java/awt/Focus/WindowIsFocusableAccessByThreadsTest/WindowIsFocusableAccessByThreadsTest.java 8169099 windows-all
+java/awt/Focus/WindowIsFocusableAccessByThreadsTest/WindowIsFocusableAccessByThreadsTest.java 8169099 windows-all,linux-all
 java/awt/Focus/WindowUpdateFocusabilityTest/WindowUpdateFocusabilityTest.html       8202926 generic-all
 java/awt/Focus/WrongKeyTypedConsumedTest/WrongKeyTypedConsumedTest.java             8169096,8213522 macosx-all,linux-all,windows-all
 java/awt/FontMetrics/FontCrash.java                                                 8198336 windows-all
-java/awt/Frame/DisposeParentGC/DisposeParentGC.java                                 8079786 macosx-all
+java/awt/Frame/DisposeParentGC/DisposeParentGC.java                                 8079786,8055833 macosx-all,linux-all
 java/awt/Frame/ExceptionOnSetExtendedStateTest/ExceptionOnSetExtendedStateTest.java 8198237 macosx-all
 java/awt/Frame/FramesGC/FramesGC.java                                               8079069 macosx-all
 java/awt/Frame/InvisibleOwner/InvisibleOwner.java                                   8169111 macosx-all,windows-all
@@ -199,13 +201,13 @@ java/awt/Frame/LayoutOnMaximizeTest/LayoutOnMaximizeTest.java
 java/awt/Frame/MaximizedUndecorated/MaximizedUndecorated.java                       8022302 generic-all
 java/awt/Frame/MiscUndecorated/RepaintTest.java                                     8079267 windows-all,linux-all
 java/awt/Frame/SetMaximizedBounds/SetMaximizedBounds.java                           8196006 macosx-all,windows-all
-java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java                       8144030 macosx-all,linux-all
+java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java                       8144030 macosx-all,linux-all,windows-all
 java/awt/Frame/UnfocusableMaximizedFrameResizablity/UnfocusableMaximizedFrameResizablity.java 8208290 macosx-all
 java/awt/Frame/WindowDragTest/WindowDragTest.java                                   8169470 generic-all
 java/awt/FullScreen/8013581/bug8013581.java                                         8169471 macosx-all,windows-all,linux-all
 java/awt/FullScreen/AltTabCrashTest/AltTabCrashTest.java                            8047218 generic-all
-java/awt/FullScreen/DisplayChangeVITest/DisplayChangeVITest.java                    8169469 windows-all
-java/awt/FullScreen/FullScreenInsets/FullScreenInsets.java                          7019055 windows-all,linux-all
+java/awt/FullScreen/DisplayChangeVITest/DisplayChangeVITest.java                    8169469 windows-all,linux-all (linux: NPE commit testing)
+java/awt/FullScreen/FullScreenInsets/FullScreenInsets.java                          7019055 windows-all,linux-all,macosx-all
 java/awt/FullScreen/NoResizeEventOnDMChangeTest/NoResizeEventOnDMChangeTest.java    8169468 windows-all
 java/awt/Graphics/CopyScaledArea/CopyScaledAreaTest.java                            8153299 windows-all
 java/awt/Graphics/LineClipTest.java                                                 JRE-898 macosx-all
@@ -221,7 +223,7 @@ java/awt/GridLayout/ComponentPreferredSize/ComponentPreferredSize.java
 java/awt/GridLayout/LayoutExtraGaps/LayoutExtraGaps.java                            8000171 windows-all
 java/awt/JAWT/JAWT.sh                                                               8197798 windows-all
 java/awt/KeyboardFocusmanager/TypeAhead/ButtonActionKeyTest/ButtonActionKeyTest.html JRE-898 macosx-all,linux-all
-java/awt/KeyboardFocusmanager/TypeAhead/EnqueueWithDialogButtonTest/EnqueueWithDialogButtonTest.java 8198623 macosx-all,windows-all
+java/awt/KeyboardFocusmanager/TypeAhead/EnqueueWithDialogButtonTest/EnqueueWithDialogButtonTest.java 8198623 macosx-all,windows-all,linux-all
 java/awt/KeyboardFocusmanager/TypeAhead/FreezeTest/FreezeTest.java                  8198623 macosx-all,windows-all
 java/awt/KeyboardFocusmanager/TypeAhead/SubMenuShowTest/SubMenuShowTest.html        8198624 macosx-all,linux-all,windows-all
 java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.html                    8198626 macosx-all,windows-all
@@ -231,25 +233,24 @@ java/awt/List/KeyEventsTest/KeyEventsTest.html
 java/awt/List/SingleModeDeselect/SingleModeDeselect.java                            8196367 windows-all
 java/awt/MenuBar/8007006/bug8007006.java                                            8202886 macosx-all
 java/awt/Mixing/AWT_Mixing/HierarchyBoundsListenerMixingTest.java                   8049405 macosx-all,windows-all,linux-all
-java/awt/Mixing/AWT_Mixing/OpaqueOverlappingChoice.java                             8048171 generic-all
-java/awt/Mixing/AWT_Mixing/JButtonInGlassPaneOverlapping.java                       8158801 windows-all,macosx-all
+java/awt/Mixing/AWT_Mixing/JButtonInGlassPaneOverlapping.java                       8158801 windows-all,macosx-all,linux-all
 java/awt/Mixing/AWT_Mixing/JButtonOverlapping.java                                  8158801 windows-all,macosx-all,linux-all
-java/awt/Mixing/AWT_Mixing/JColorChooserOverlapping.java                            8158801 windows-all,linux-all
-java/awt/Mixing/AWT_Mixing/JComboBoxOverlapping.java                                8158801 windows-all,macosx-all
+java/awt/Mixing/AWT_Mixing/JColorChooserOverlapping.java                            8158801 windows-all,macosx-all,linux-all
+java/awt/Mixing/AWT_Mixing/JComboBoxOverlapping.java                                8158801 windows-all,macosx-all,linux-all
 java/awt/Mixing/AWT_Mixing/JEditorPaneInGlassPaneOverlapping.java                   8158801 windows-all,macosx-all,linux-all
 java/awt/Mixing/AWT_Mixing/JEditorPaneOverlapping.java                              8158801 windows-all,macosx-all,linux-all
 java/awt/Mixing/AWT_Mixing/JGlassPaneInternalFrameOverlapping.java                  8158801,8049405 windows-all,macosx-all,linux-all
-java/awt/Mixing/AWT_Mixing/JGlassPaneMoveOverlapping.java                           8158801 windows-all,linux-all
-java/awt/Mixing/AWT_Mixing/JInternalFrameMoveOverlapping.java                       8158801 windows-all
-java/awt/Mixing/AWT_Mixing/JInternalFrameOverlapping.java                           8158801 windows-all
+java/awt/Mixing/AWT_Mixing/JGlassPaneMoveOverlapping.java                           8158801 windows-all,macosx-all,linux-all
+java/awt/Mixing/AWT_Mixing/JInternalFrameMoveOverlapping.java                       8158801 windows-all,macosx-all,linux-all
+java/awt/Mixing/AWT_Mixing/JInternalFrameOverlapping.java                           8158801 windows-all,macosx-all,linux-all
 java/awt/Mixing/AWT_Mixing/JLabelInGlassPaneOverlapping.java                        8158801 windows-all,macosx-all,linux-all
 java/awt/Mixing/AWT_Mixing/JLabelOverlapping.java                                   8158801 windows-all,macosx-all,linux-all
 java/awt/Mixing/AWT_Mixing/JListInGlassPaneOverlapping.java                         8158801 windows-all,macosx-all,linux-all
 java/awt/Mixing/AWT_Mixing/JListOverlapping.java                                    8158801 windows-all,macosx-all,linux-all
-java/awt/Mixing/AWT_Mixing/JMenuBarOverlapping.java                                 8159451 linux-all,windows-all,macosx-all
+java/awt/Mixing/AWT_Mixing/JMenuBarOverlapping.java                                 8159451,8194045 linux-all,windows-all,macosx-all
 java/awt/Mixing/AWT_Mixing/JPanelInGlassPaneOverlapping.java                        8158801 windows-all,macosx-all,linux-all
 java/awt/Mixing/AWT_Mixing/JPanelOverlapping.java                                   8158801 windows-all,macosx-all,linux-all
-java/awt/Mixing/AWT_Mixing/JPopupMenuOverlapping.java                               8158801 windows-all,macosx-all,linux-all
+java/awt/Mixing/AWT_Mixing/JPopupMenuOverlapping.java                               8158801,8049405 windows-all,macosx-all,linux-all
 java/awt/Mixing/AWT_Mixing/JProgressBarInGlassPaneOverlapping.java                  8158801 windows-all,macosx-all,linux-all
 java/awt/Mixing/AWT_Mixing/JProgressBarOverlapping.java                             8158801 windows-all,macosx-all,linux-all
 java/awt/Mixing/AWT_Mixing/JScrollBarInGlassPaneOverlapping.java                    8158801 windows-all,macosx-all,linux-all
@@ -269,15 +270,17 @@ java/awt/Mixing/AWT_Mixing/JTextFieldOverlapping.java
 java/awt/Mixing/AWT_Mixing/JToggleButtonInGlassPaneOverlapping.java                 8158801 windows-all,macosx-all,linux-all
 java/awt/Mixing/AWT_Mixing/JToggleButtonOverlapping.java                            8158801 windows-all,macosx-all,linux-all
 java/awt/Mixing/AWT_Mixing/JInternalFrameMoveOverlapping.java                       6986109 windows-all
+java/awt/Mixing/AWT_Mixing/JComboBoxOverlapping.java                                8049405 macosx-all,windows-all
 java/awt/Mixing/AWT_Mixing/MixingFrameResizing.java                                 8049405 generic-all
 java/awt/Mixing/AWT_Mixing/MixingPanelsResizing.java                                8049405 generic-all
-java/awt/Mixing/AWT_Mixing/JComboBoxOverlapping.java                                8049405 macosx-all,windows-all
-java/awt/Mixing/AWT_Mixing/JPopupMenuOverlapping.java                               8049405 macosx-all,windows-all
+java/awt/Mixing/AWT_Mixing/OpaqueOverlapping.java                                   8194045 generic-all
+java/awt/Mixing/AWT_Mixing/OpaqueOverlappingChoice.java                             8048171 generic-all
+java/awt/Mixing/AWT_Mixing/ViewportOverlapping.java                                 8194045 generic-all
 java/awt/Mixing/MixingOnDialog.java                                                 7124549 macosx-all,windows-all
 java/awt/Mixing/MixingOnShrinkingHWButton.java                                      7124549 macosx-all,windows-all
 java/awt/Mixing/NonOpaqueInternalFrame.java                                         7124549 macosx-all,windows-all
-java/awt/Mixing/OpaqueTest.java                                                     7124549 macosx-all,windows-all
-java/awt/Mixing/OverlappingButtons.java                                             7124549 macosx-all,windows-all
+java/awt/Mixing/OpaqueTest.java                                                     7124549,8169457 macosx-all,windows-all,linux-all
+java/awt/Mixing/OverlappingButtons.java                                             7124549 macosx-all,windows-all,linux-all
 java/awt/Mixing/Validating.java                                                     8198002 windows-all
 java/awt/Modal/FileDialog/FileDialogAppModal1Test.java                              7186009,8198664 macosx-all,windows-all,linux-all
 java/awt/Modal/FileDialog/FileDialogAppModal2Test.java                              7186009,8198664 macosx-all,windows-all,linux-all
@@ -312,7 +315,7 @@ java/awt/Modal/FileDialog/FileDialogTKModal3Test.java
 java/awt/Modal/FileDialog/FileDialogTKModal4Test.java                               7186009,8196430 generic-all
 java/awt/Modal/FileDialog/FileDialogTKModal5Test.java                               7186009,8196430 generic-all
 java/awt/Modal/FileDialog/FileDialogTKModal6Test.java                               7186009,8196430 generic-all
-java/awt/Modal/FileDialog/FileDialogTKModal7Test.java                               8196430 macosx-all,windows-all
+java/awt/Modal/FileDialog/FileDialogTKModal7Test.java                               8196430,8198664 macosx-all,windows-all,linux-all
 java/awt/Modal/ModalBlockingTests/BlockingDDAppModalTest.java                       8198665 macosx-all,windows-all,linux-all
 java/awt/Modal/ModalBlockingTests/BlockingDDDocModalTest.java                       8198665 macosx-all,windows-all,linux-all
 java/awt/Modal/ModalBlockingTests/BlockingDDModelessTest.java                       8198665 macosx-all,windows-all,linux-all
@@ -327,12 +330,12 @@ java/awt/Modal/ModalBlockingTests/BlockingDFWModeless2Test.java
 java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal1Test.java                     8198665 macosx-all,windows-all,linux-all
 java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal2Test.java                     8198665 macosx-all,windows-all,linux-all
 java/awt/Modal/ModalBlockingTests/BlockingDocModalTest.java                         8198665 macosx-all,windows-all,linux-all
-java/awt/Modal/ModalBlockingTests/BlockingFDAppModalTest.java                       8208512,8213530,8198282 macosx-all,windows-all, linux-all
-java/awt/Modal/ModalBlockingTests/BlockingFDDocModalTest.java                       8208512,8213530,8198282 macosx-all,windows-all, linux-all
+java/awt/Modal/ModalBlockingTests/BlockingFDAppModalTest.java                       8208512,8213530,8198282 macosx-all,windows-all,linux-all
+java/awt/Modal/ModalBlockingTests/BlockingFDDocModalTest.java                       8208512,8213530,8198282 macosx-all,windows-all,linux-all
 java/awt/Modal/ModalBlockingTests/BlockingFDModelessTest.java                       8198665 macosx-all,windows-all,linux-all
 java/awt/Modal/ModalBlockingTests/BlockingFDNonModalTest.java                       8198665 macosx-all,windows-all,linux-all
-java/awt/Modal/ModalBlockingTests/BlockingFDSetModalTest.java                       8208512,8213530,8198282 macosx-all,windows-all, linux-all
-java/awt/Modal/ModalBlockingTests/BlockingFDToolkitModalTest.java                   8208512,8213530,8198282 macosx-all,windows-all, linux-all
+java/awt/Modal/ModalBlockingTests/BlockingFDSetModalTest.java                       8208512,8213530,8198282 macosx-all,windows-all,linux-all
+java/awt/Modal/ModalBlockingTests/BlockingFDToolkitModalTest.java                   8208512,8213530,8198282 macosx-all,windows-all,linux-all
 java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal1Test.java                     8198665 macosx-all,windows-all,linux-all
 java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal2Test.java                     8198665 macosx-all,windows-all,linux-all
 java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal3Test.java                     8198665 macosx-all,windows-all,linux-all
@@ -391,8 +394,8 @@ java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFModelessTest.java
 java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFNonModalTest.java            8196432,8208512 linux-all,macosx-all,windows-all
 java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsAppModalTest.java        8164473,8208512 linux-all,macosx-all,windows-all
 java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsDocModalTest.java        8164473,8208512 linux-all,macosx-all,windows-all
-java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsModelessTest.java        8196432,8208512 linux-all,macosx-all,windows-all
-java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsNonModalTest.java        8196432,8208512 linux-all,macosx-all,windows-all
+java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsModelessTest.java        8164473,8196432,8208512 linux-all,macosx-all,windows-all
+java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsNonModalTest.java        8164473,8196432,8208512 linux-all,macosx-all,windows-all
 java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFAppModalTest.java            8164473,8208512 macosx-all,linux-all,windows-all
 java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWAppModalTest.java            8164473,8208512 macosx-all,linux-all,windows-all
 java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWDocModalTest.java            8196432,8208512 macosx-all,linux-all,windows-all
@@ -480,14 +483,14 @@ java/awt/Modal/ToBack/ToBackModal1Test.java
 java/awt/Modal/ToBack/ToBackModal2Test.java                                         8196441 macosx-all,windows-all,linux-all
 java/awt/Modal/ToBack/ToBackModal3Test.java                                         8196441 macosx-all,windows-all,linux-all
 java/awt/Modal/ToBack/ToBackModal4Test.java                                         8196441 macosx-all,windows-all,linux-all
-java/awt/Modal/ToBack/ToBackModal5Test.java                                         8208512 macosx-all,windows-all
-java/awt/Modal/ToBack/ToBackModal6Test.java                                         8208512 macosx-all,windows-all
+java/awt/Modal/ToBack/ToBackModal5Test.java                                         8208512 macosx-all,windows-all,linux-all
+java/awt/Modal/ToBack/ToBackModal6Test.java                                         8208512 macosx-all,windows-all,linux-all
 java/awt/Modal/ToBack/ToBackModeless1Test.java                                      8196441,8198347 macosx-all,windows-all,linux-all
 java/awt/Modal/ToBack/ToBackModeless2Test.java                                      8196441,8198347 macosx-all,windows-all,linux-all
 java/awt/Modal/ToBack/ToBackModeless3Test.java                                      8196441,8198347 macosx-all,windows-all,linux-all
 java/awt/Modal/ToBack/ToBackModeless4Test.java                                      8196441,8198347 macosx-all,windows-all,linux-all
 java/awt/Modal/ToBack/ToBackModeless5Test.java                                      8196441 macosx-all,windows-all,linux-all
-java/awt/Modal/ToBack/ToBackModeless6Test.java                                      8208512 macosx-all,windows-all
+java/awt/Modal/ToBack/ToBackModeless6Test.java                                      8208512 macosx-all,windows-all,linux-all
 java/awt/Modal/ToBack/ToBackNonModal1Test.java                                      8196441,8198347 macosx-all,windows-all,linux-all
 java/awt/Modal/ToBack/ToBackNonModal2Test.java                                      8196441,8198347 macosx-all,windows-all,linux-all
 java/awt/Modal/ToBack/ToBackNonModal3Test.java                                      8196441,8198347 macosx-all,windows-all,linux-all
@@ -499,7 +502,7 @@ java/awt/Modal/ToBack/ToBackTKModal2Test.java
 java/awt/Modal/ToBack/ToBackTKModal3Test.java                                       8196441 macosx-all,windows-all,linux-all
 java/awt/Modal/ToBack/ToBackTKModal4Test.java                                       8196441 macosx-all,windows-all,linux-all
 java/awt/Modal/ToBack/ToBackTKModal5Test.java                                       8196441 macosx-all,windows-all,linux-all
-java/awt/Modal/ToBack/ToBackTKModal6Test.java                                       8208512 macosx-all,windows-all
+java/awt/Modal/ToBack/ToBackTKModal6Test.java                                       8208512 macosx-all,windows-all,linux-all
 java/awt/Modal/ToFront/DialogToFrontAppModalTest.java                               8196441 macosx-all,windows-all,linux-all
 java/awt/Modal/ToFront/DialogToFrontDocModalTest.java                               8196441 macosx-all,windows-all,linux-all
 java/awt/Modal/ToFront/DialogToFrontModalTest.java                                  8196441 macosx-all,windows-all,linux-all
@@ -526,23 +529,25 @@ java/awt/Modal/ToFront/FrameToFrontTKModal3Test.java
 java/awt/Modal/ToFront/FrameToFrontTKModal4Test.java                                8196441 macosx-all,windows-all,linux-all
 java/awt/Modal/ToFront/FrameToFrontTKModal5Test.java                                8196441 macosx-all,windows-all,linux-all
 java/awt/Mouse/EnterExitEvents/DragWindowOutOfFrameTest.java                        8177326 macosx-all,windows-all
-java/awt/Mouse/EnterExitEvents/DragWindowTest.java                                  8023562 macosx-all,windows-all
+java/awt/Mouse/EnterExitEvents/DragWindowTest.java                                  8023562 macosx-all,windows-all,linux-all
 java/awt/Mouse/EnterExitEvents/ModalDialogEnterExitEventsTest.java                  JRE-898 macosx-all,windows-all,linux-all
 java/awt/Mouse/EnterExitEvents/ResizingFrameTest.java                               8005021 macosx-all,windows-all,linux-all
 java/awt/Mouse/EnterExitEvents/FullscreenEnterEventTest.java                        8051455 macosx-all
-java/awt/Mouse/ExtraMouseClick/ExtraMouseClick.html                                 8169534 macosx-all,windows-all
-java/awt/Mouse/GetMousePositionTest/GetMousePositionWithOverlay.java                8168388 windows-all,macosx-all
-java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java                  8196017 windows-all
+java/awt/Mouse/ExtraMouseClick/ExtraMouseClick.html                                 8169534 macosx-all,windows-all,linux-all
+java/awt/Mouse/GetMousePositionTest/GetMousePositionWithOverlay.java                8168388 windows-all,macosx-all,linux-all
+java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java                  8196017 windows-all,linux-all (linux: NPE commit testing)
+java/awt/Mouse/MouseComboBoxTest/MouseComboBoxTest.java                             8052166 linux-all
 java/awt/Mouse/MouseDragEvent/MouseDraggedTest.java                                 8080676,8129775 generic-all
 java/awt/Mouse/MouseModifiersUnitTest/ExtraButtonDrag.java                          8013428 generic-all
 java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersInKeyEvent.java                 8157147 macosx-all,linux-all,solaris-all,windows-all
-java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersUnitTest_Standard.java          7124407 macosx-all
+java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersUnitTest_Standard.java          7124407 macosx-all,windows-all,linux-all
 java/awt/Mouse/RemovedComponentMouseListener/RemovedComponentMouseListener.java     8157170 macosx-all,windows-all
 java/awt/Mouse/TitleBarDoubleClick/TitleBarDoubleClick.html                         8148041 linux-all
 java/awt/MouseInfo/GetPointerInfoTest.java                                          8158798 windows-all
 java/awt/Multiscreen/LocationRelativeToTest/LocationRelativeToTest.java             7124230 generic-all
+java/awt/Multiscreen/MultiScreenLocationTest/MultiScreenLocationTest.java           8155744 windows-all,linux-all
 java/awt/Paint/PaintNativeOnUpdate.java                                             8028000 generic-all
-java/awt/Paint/bug8024864.java                                                      8176512 macosx-all
+java/awt/Paint/bug8024864.java                                                      8176512 windows-all,macosx-all,linux-all
 java/awt/PrintJob/PrinterException.java                                             8194045 generic-all
 java/awt/Robot/AcceptExtraMouseButtons/AcceptExtraMouseButtons.java                 7107528 linux-all,macosx-all,windows-all
 java/awt/Robot/HiDPIScreenCapture/ScreenCaptureTest.java                            8215105 macosx-all,windows-all
@@ -550,15 +555,15 @@ java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java
 java/awt/Robot/RobotWheelTest/RobotWheelTest.java                                   8129827 generic-all
 java/awt/ScrollPane/ScrollPanePreferredSize/ScrollPanePreferredSize.java            JRE-898 macosx-all
 java/awt/Scrollbar/ScrollbarMouseWheelTest/ScrollbarMouseWheelTest.java             8196018 windows-all,linux-all
-java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java          8061235,8159592,8134231 macosx-all,windows-all
+java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java          8061235,8159592,8134231 macosx-all,windows-all,linux-all
 java/awt/SplashScreen/MultiResolutionSplash/unix/UnixMultiResolutionSplashTest.java 8203004 linux-all
-java/awt/TextArea/AutoScrollOnSelectAndAppend/AutoScrollOnSelectAndAppend.java      8213120 macosx-all
+java/awt/TextArea/AutoScrollOnSelectAndAppend/AutoScrollOnSelectAndAppend.java      8213120 macosx-all,linux-4.15.0-45-generic (kubuntu)
 java/awt/TextArea/TextAreaScrolling/TextAreaScrolling.java                          8196300 windows-all
 java/awt/TextField/SelectionInvisibleTest/SelectionInvisibleTest.java               8169533 macosx-all,windows-all
 java/awt/Toolkit/DesktopProperties/rfe4758438.java                                  8193547 linux-all
 java/awt/Toolkit/LockingKeyStateTest/LockingKeyStateTest.java                       8208514 windows-all
-java/awt/Toolkit/RealSync/Test.java                                                 6849383 macosx-all
-java/awt/Toolkit/ScreenInsetsTest/ScreenInsetsTest.java                             6829250 windows-all,macosx-all
+java/awt/Toolkit/RealSync/Test.java                                                 6849383 generic-all
+java/awt/Toolkit/ScreenInsetsTest/ScreenInsetsTest.java                             6829250 windows-all,linux-all,macosx-all
 java/awt/Toolkit/ToolkitPropertyTest/ToolkitPropertyTest_Enable.java                6847163 generic-all
 java/awt/TrayIcon/ActionCommand/ActionCommand.java                                  8197575,8150540 macosx-all,windows-all
 java/awt/TrayIcon/ActionEventMask/ActionEventMask.java                              8197575,8150540 macosx-all,windows-all
@@ -577,52 +582,56 @@ java/awt/TrayIcon/PopupMenuLeakTest/PopupMenuLeakTest.java
 java/awt/Window/8159168/SetShapeTest.java                                           8208507 generic-all
 java/awt/Window/BackgroundIsNotUpdated/BackgroundIsNotUpdated.java                  8142536 generic-all
 java/awt/Window/Grab/GrabTest.java                                                  8196019 macosx-all,windows-all,linux-all
-java/awt/Window/MultiWindowApp/ChildAlwaysOnTopTest.java                            8215132 macosx-all,windows-all
+java/awt/Window/MultiWindowApp/ChildAlwaysOnTopTest.java                            8215132,8194941 macosx-all,windows-all,linux-all
 java/awt/Window/MultiWindowApp/MultiWindowAppTest.java                              8159904 macosx-all,windows-all
-java/awt/Window/ShapedAndTranslucentWindows/FocusAWTTest.java                       8061236 macosx-all,windows-all
-java/awt/Window/ShapedAndTranslucentWindows/SetShape.java                           8208509 macosx-all,windows-all
-java/awt/Window/ShapedAndTranslucentWindows/SetShapeAndClick.java                   8197936 macosx-all,windows-all
-java/awt/Window/ShapedAndTranslucentWindows/SetShapeDynamicallyAndClick.java        8013450,8197936 macosx-all,windows-all
-java/awt/Window/ShapedAndTranslucentWindows/Shaped.java                             8078999,8198690 macosx-all,windows-all
+java/awt/Window/ShapedAndTranslucentWindows/FocusAWTTest.java                       8061236 macosx-all,windows-all,linux-all
+java/awt/Window/ShapedAndTranslucentWindows/SetShape.java                           8208509 macosx-all,windows-all,linux-all
+java/awt/Window/ShapedAndTranslucentWindows/SetShapeAndClick.java                   8197936 macosx-all,windows-all,linux-4.18.16-200.fc28.x86_64,linux-all (linux-all timeout reproduced with Adopt)
+java/awt/Window/ShapedAndTranslucentWindows/SetShapeDynamicallyAndClick.java        8013450,8197936 macosx-all,linux-all,windows-all
+java/awt/Window/ShapedAndTranslucentWindows/Shaped.java                             8078999,8198690 macosx-all,linux-all,windows-all
 java/awt/Window/ShapedAndTranslucentWindows/ShapedByAPI.java                        8078999 macosx-all,linux-all,windows-all
-java/awt/Window/ShapedAndTranslucentWindows/ShapedTranslucent.java                  8078999,8198690 macosx-all,windows-all
+java/awt/Window/ShapedAndTranslucentWindows/ShapedTranslucent.java                  8078999,8198690 macosx-all,linux-all,windows-all
 java/awt/Window/ShapedAndTranslucentWindows/ShapedTranslucentWindowClick.java       8013450 macosx-all,linux-all,windows-all (windows: commit testing time out)
 java/awt/Window/ShapedAndTranslucentWindows/StaticallyShaped.java                   8198690,8165218 macosx-all,linux-all,windows-all
 java/awt/Window/ShapedAndTranslucentWindows/TranslucentChoice.java                  8194129 macosx-all,windows-all,linux-all
 java/awt/Window/ShapedAndTranslucentWindows/TranslucentWindowClick.java             8194129 macosx-all,windows-all,linux-all
-java/awt/Window/AlwaysOnTop/AutoTestOnTop.java                                      6847593 macosx-all,windows-all,linux-all
+java/awt/Window/AlwaysOnTop/AutoTestOnTop.java                                      6847593,8194045 macosx-all,windows-all,linux-all
 java/awt/Window/AlwaysOnTop/TestAlwaysOnTopBeforeShow.java                          8169530 macosx-all,windows-all
 java/awt/Window/GrabSequence/GrabSequence.java                                      6848409 macosx-all,windows-all,linux-all
 java/awt/Window/LocationAtScreenCorner/LocationAtScreenCorner.java                  8203371 linux-all,solaris-all
-java/awt/Window/setLocRelativeTo/SetLocationRelativeToTest.java                     JRE-1173 windows-all
+java/awt/Window/setLocRelativeTo/SetLocationRelativeToTest.java                     JRE-1173 windows-all,linux-all
 java/awt/datatransfer/ConstructFlavoredObjectTest/ConstructFlavoredObjectTest.java  8202860 linux-all
 java/awt/datatransfer/DataFlavor/DataFlavorRemoteTest.java                          JRE-898 macosx-all
 java/awt/datatransfer/DragImage/MultiResolutionDragImageTest.java                   8080982 generic-all
 java/awt/datatransfer/DragUnicodeBetweenJVMTest/DragUnicodeBetweenJVMTest.html      8017457 windows-all
 java/awt/datatransfer/SystemFlavorMap/AddFlavorTest.java                            8079268 linux-all
 java/awt/dnd/BadSerializaionTest/BadSerializationTest.java                          8039082 generic-all
-java/awt/dnd/Button2DragTest/Button2DragTest.java                                   8157172 macosx-all,windows-all
+java/awt/dnd/Button2DragTest/Button2DragTest.java                                   8157172 macosx-all,linux-all,windows-all
 java/awt/dnd/DisposeFrameOnDragCrash/DisposeFrameOnDragTest.java                    8202790 macosx-all,linux-all
 java/awt/dnd/DragInterceptorAppletTest/DragInterceptorAppletTest.html               8215538 windows-all
-java/awt/dnd/DropTargetEnterExitTest/ExtraDragEnterTest.java                        8029680 macosx-all,windows-all
+java/awt/dnd/DropTargetEnterExitTest/ExtraDragEnterTest.java                        8029680 macosx-all,linux-all,windows-all
 java/awt/dnd/DropTargetEnterExitTest/MissedDragExitTest.java                        8028998,8159694 macosx-all,windows-all,linux-all
 java/awt/dnd/ImageTransferTest/ImageTransferTest.java                               8176556 generic-all
+java/awt/dnd/InterJVMGetDropSuccessTest/InterJVMGetDropSuccessTest.html
 java/awt/dnd/MissingDragExitEventTest/MissingDragExitEventTest.java                 8030121 macosx-all,windows-all,linux-all
 java/awt/dnd/MissingEventsOnModalDialog/MissingEventsOnModalDialogTest.java         8164464 linux-all,macosx-all,windows-all
-java/awt/dnd/NoFormatsCrashTest/NoFormatsCrashTest.html                             8214221 windows-all,macosx-all
+java/awt/dnd/NoFormatsCrashTest/NoFormatsCrashTest.html                             8214221 windows-all,linux-all,macosx-all
 java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.html                     8171510 macosx-all
 java/awt/dnd/URIListToFileListBetweenJVMsTest/URIListToFileListBetweenJVMsTest.html 8194947 generic-all
+java/awt/event/ComponentEvent/MovedResizedTardyEventTest/MovedResizedTardyEventTest.html 6511207 generic-all
 java/awt/event/HierarchyEvent/AncestorResized/AncestorResized.java                  6618538 generic-all
 java/awt/event/InputEvent/EventWhenTest/EventWhenTest.java                          8168646 generic-all
 java/awt/event/KeyEvent/CorrectTime/CorrectTime.java                                6626492 generic-all
 java/awt/event/KeyEvent/DeadKey/DeadKeySystemAssertionDialog.java                   8194045 generic-all
-java/awt/event/KeyEvent/ExtendedKeyCode/ExtendedKeyCodeTest.java                    8169476 windows-all
+java/awt/event/KeyEvent/ExtendedKeyCode/ExtendedKeyCodeTest.java                    8169476 windows-all,linux-all
 java/awt/event/KeyEvent/ExtendedModifiersTest/ExtendedModifiersTest.java            8129778 generic-all
-java/awt/event/KeyEvent/KeyChar/KeyCharTest.java                                    8169474 windows-all
+java/awt/event/KeyEvent/KeyChar/KeyCharTest.java                                    8169474 windows-all,linux-all
 java/awt/event/KeyEvent/KeyMaskTest/KeyMaskTest.java                                8129778 generic-all
+java/awt/event/MouseEvent/AcceptExtraButton/AcceptExtraButton.java                  8194045 generic-all
 java/awt/event/MouseEvent/EventTimeInFuture/EventTimeInFuture.java                  8032254,6626492 linux-all
 java/awt/event/MouseEvent/MouseButtonsAndKeyMasksTest/MouseButtonsAndKeyMasksTest.java 8129778 generic-all
 java/awt/event/MouseEvent/MouseClickTest/MouseClickTest.html                        8168389 windows-all,macosx-all,linux-all
+java/awt/event/MouseEvent/MouseEnterExitTest/MouseEnterExitTest.html                8194045 generic-all
 java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter_3.java                6854300 generic-all
 java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion.java             8204200,8060176 windows-all,macosx-all,linux-all
 java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_1.java           8204200,8060176 windows-all,macosx-all,linux-all
@@ -632,13 +641,14 @@ java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.java
 java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.html           8204200,8060176 windows-all,macosx-all,linux-all
 java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_4.java           8204200 windows-all,macosx-all,linux-all
 java/awt/event/MouseWheelEvent/WheelModifier/WheelModifier.java                     8169475 windows-all,linux-all
+java/awt/font/Rotate/RotatedTextTest.java                                           8219641 linux-all
+java/awt/font/StyledMetrics/BoldSpace.java                                          8198422 linux-all
 java/awt/font/TextLayout/CombiningPerf.java                                         8192931 generic-all
 java/awt/font/TextLayout/LigatureCaretTest.java                                     8197821 generic-all
 java/awt/font/TextLayout/OSXLigatureTest.java                                       JRE-865 macosx-all
 java/awt/font/TextLayout/TextLayoutBounds.java                                      8169188 generic-all
-java/awt/font/StyledMetrics/BoldSpace.java                                          8198422 linux-all
 java/awt/grab/EmbeddedFrameTest1/EmbeddedFrameTest1.java                            7080150 macosx-all
-java/awt/grab/GrabOnUnfocusableToplevel/GrabOnUnfocusableToplevel.java              8169109 windows-all
+java/awt/grab/GrabOnUnfocusableToplevel/GrabOnUnfocusableToplevel.java              8169109 windows-all,linux-all,macosx-all
 java/awt/im/memoryleak/InputContextMemoryLeakTest.java                              8023814 linux-all,solaris-all
 java/awt/image/DrawImage/IncorrectAlphaSurface2SW.java                              8056077 generic-all
 java/awt/image/DrawImage/IncorrectBounds.java                                       8169473 windows-all
@@ -652,7 +662,7 @@ java/awt/image/multiresolution/MultiresolutionIconTest.java
 java/awt/image/multiresolution/MultiResolutionJOptionPaneIconTest.java              8204214,8193941 macosx-all,windows-all,linux-all
 java/awt/image/VolatileImage/BitmaskVolatileImage.java                              8133102 linux-all
 java/awt/image/VolatileImage/CustomCompositeTest.java                               8199002 windows-all,linux-all
-java/awt/image/VolatileImage/GradientPaints.java                                    8199003,8194045 linux-all,windows-all
+java/awt/image/VolatileImage/GradientPaints.java                                    8199003,8194045 macosx-all,linux-all,windows-all
 java/awt/print/Headless/HeadlessPrinterJob.java                                     8196088 windows-all
 java/awt/print/PrinterJob/CheckPrivilege.java                                       8212202 windows-all
 java/awt/print/PrinterJob/GetMediasTest.java                                        8213288 windows-all
@@ -669,14 +679,15 @@ sun/awt/shell/ShellFolderMemoryLeak.java
 
 sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java     8022403 generic-all
 sun/java2d/DirectX/OverriddenInsetsTest/OverriddenInsetsTest.java                   8196102 generic-all
-sun/java2d/DirectX/RenderingToCachedGraphicsTest/RenderingToCachedGraphicsTest.java 8196180 windows-all,macosx-all
-sun/java2d/GdiRendering/InsetClipping.java                                          8196181,7124403,8031433 macosx-all,windows-all
+sun/java2d/DirectX/RenderingToCachedGraphicsTest/RenderingToCachedGraphicsTest.java 8196180 windows-all,linux-all,macosx-all
+sun/java2d/GdiRendering/InsetClipping.java                                          8196181,7124403,8031433 macosx-all,windows-all,linux-all
 sun/java2d/SunGraphics2D/EmptyClipRenderingTest.java                                8144029 macosx-all
 sun/java2d/SunGraphics2D/DrawImageBilinear.java                                     8191406 generic-all
 sun/java2d/SunGraphics2D/PolyVertTest.java                                          6986565 generic-all
 sun/java2d/SunGraphics2D/SimplePrimQuality.java                                     6992007 generic-all
 sun/java2d/SunGraphics2D/SourceClippingBlitTest/SourceClippingBlitTest.java         8196185 generic-all
 sun/java2d/X11SurfaceData/SharedMemoryPixmapsTest/SharedMemoryPixmapsTest.sh        7184899 windows-all,linux-all,macosx-all
+sun/java2d/marlin/ClipShapeTest.java                                                8194045 generic-all
 sun/java2d/pipe/InterpolationQualityTest.java                                       8171303 windows-all,linux-all,macosx-all
 
 ############################################################################
@@ -686,13 +697,16 @@ sun/java2d/pipe/InterpolationQualityTest.java
 java/beans/Introspector/8132566/OverridePropertyInfoTest.java                       8132565 generic-all
 java/beans/Introspector/8132566/OverrideUserDefPropertyInfoTest.java                8132565 generic-all
 
-java/beans/XMLEncoder/Test6570354.java 8015593 macosx-all
+java/beans/XMLDecoder/8028054/TestMethodFinder.java                                 8194045 generic-all
+java/beans/XMLEncoder/Test6570354.java                                              8015593 macosx-all
 
 ############################################################################
 
 # jdk_lang
 
 java/lang/StringCoding/CheckEncodings.sh                                            7008363 generic-all
+java/lang/System/LoggerFinder/modules/JDKLoggerForImageTest.java                    nobug windows-6.1 fails on Windows 7 only
+java/lang/System/LoggerFinder/modules/UnnamedLoggerForImageTest.java                nobug windows-6.1 fails on Windows 7 only
 
 ############################################################################
 
@@ -747,6 +761,7 @@ java/net/httpclient/ProxyAuthDisabledSchemesSSL.java
 java/net/httpclient/UnknownBodyLengthTest.java                                      8210130 macosx-all,windows-all
 
 com/sun/net/httpserver/bugs/B6361557.java                                           8196070 windows-all
+sun/net/www/protocol/jar/jarbug/TestDriver.java                                     nobug windows-6.1 fails on Windows 7 only
 
 ############################################################################
 
@@ -877,7 +892,7 @@ javax/sound/sampled/DataLine/LongFramePosition.java
 javax/sound/sampled/Clip/AutoCloseTimeCheck.java                                    8207150 generic-all
 
 javax/sound/sampled/Clip/Drain/ClipDrain.java                                       7062792 generic-all
-javax/sound/sampled/Mixers/DisabledAssertionCrash.java                              7067310 generic-all
+javax/sound/sampled/Mixers/DisabledAssertionCrash.java                              7067310,8194045 generic-all
 javax/sound/midi/Sequencer/Recording.java                                           8167580 linux-all,solaris-all
 
 ############################################################################
@@ -892,17 +907,18 @@ com/sun/java/swing/plaf/windows/Test8173145.java
 javax/swing/AbstractButton/6711682/bug6711682.java                                  8060765 windows-all,macosx-all
 javax/swing/Action/8133039/bug8133039.java                                          8196089 windows-all,macosx-all
 javax/swing/JButton/4368790/bug4368790.java                                         8065582 macosx-all
-javax/swing/JButton/8151303/PressedIconTest.java                                    8198689 macosx-all
+javax/swing/JButton/8151303/PressedIconTest.java                                    8198689 macosx-all,windows-all (windows: commit testing)
 javax/swing/JButton/PressedButtonRightClickTest.java                                8203906 windows-all
 javax/swing/JCheckBox/8032667/bug8032667_image_diff.java                            8199063 macosx-all
 javax/swing/JColorChooser/Test6199676.java                                          8198398 generic-all
 javax/swing/JColorChooser/Test6541987.java                                          8143021,8072110 windows-all,linux-all,macosx-all
+javax/swing/JColorChooser/Test6827032.java                                          8197825 windows-all
 javax/swing/JColorChooser/Test7194184.java                                          8194126,8072110 linux-all,macosx-all,windows-all
 javax/swing/JColorChooser/Test8051548.java                                          8197552 macosx-all,windows-all,linux-all
 javax/swing/JComboBox/4743225/bug4743225.java                                       8171302 windows-all,macosx-all
 javax/swing/JComboBox/6236162/bug6236162.java                                       8028707 windows-all,macosx-all
 javax/swing/JComboBox/6559152/bug6559152.java                                       8196090 windows-all,macosx-all,linux-all
-javax/swing/JComboBox/6607130/bug6607130.java                                       8196091,JRE-948 windows-all,macosx-all
+javax/swing/JComboBox/6607130/bug6607130.java                                       8196091 windows-all
 javax/swing/JComboBox/7031551/bug7031551.java                                       8199056 generic-all
 javax/swing/JComboBox/8032878/bug8032878.java                                       8196092 windows-all,macosx-all
 javax/swing/JComboBox/8032878/bug8032878.java                                       8196439 macosx-all,windows-all,linux-all
@@ -936,9 +952,9 @@ javax/swing/JFileChooser/DeserializedJFileChooser/DeserializedJFileChooserTest.j
 javax/swing/JFrame/8016356/bug8016356.java                                          8169955 windows-all
 javax/swing/JFrame/8175301/ScaledFrameBackgroundTest.java                           8193942 generic-all
 javax/swing/JInternalFrame/5066752/bug5066752.java                                  8207850 macosx-all,windows-all
-javax/swing/JInternalFrame/8069348/bug8069348.java                                  8208570 macosx-all,windows-all
-javax/swing/JInternalFrame/8145896/TestJInternalFrameMaximize.java                  8194944 macosx-all,windows-all
-javax/swing/JInternalFrame/8145896/TestJInternalFrameMaximize.java                  8194944 macosx-all,windows-all
+javax/swing/JInternalFrame/8069348/bug8069348.java                                  8208570 macosx-all,windows-all,linux-all
+javax/swing/JInternalFrame/8145060/TestJInternalFrameMinimize.java                  8203918 windows-all,linux-all
+javax/swing/JInternalFrame/8145896/TestJInternalFrameMaximize.java                  8194944 macosx-all,windows-all,linux-all
 javax/swing/JInternalFrame/8146321/JInternalFrameIconTest.java                      8168135 macosx-all,linux-all
 javax/swing/JInternalFrame/8160248/JInternalFrameDraggingTest.java                  8186513 generic-all
 javax/swing/JInternalFrame/DockIconRepaint/DockIconRepaint.java                     8208289 macosx-all
@@ -952,28 +968,32 @@ javax/swing/JMenu/4692443/bug4692443.java
 javax/swing/JMenu/6359669/bug6359669.java                                           8050988 generic-all
 javax/swing/JMenu/6470128/bug6470128.java                                           8050988 generic-all
 javax/swing/JMenu/6538132/6538132.java                                              8197552 macosx-all,windows-all,linux-all
-javax/swing/JMenu/8072900/WrongSelectionOnMouseOver.java                            8204073 macosx-all,windows-all
+javax/swing/JMenu/8072900/WrongSelectionOnMouseOver.java                            8204073 macosx-all,windows-all,linux-all
 javax/swing/JMenuBar/4750590/bug4750590.java                                        8197552 macosx-all,windows-all,linux-all
 javax/swing/JMenuItem/4171437/bug4171437.java                                       8197552 macosx-all,windows-all,linux-all
 javax/swing/JMenuItem/4654927/bug4654927.java                                       8172536 macosx-all,windows-all,linux-all
 javax/swing/JMenuItem/6209975/bug6209975.java                                       8204062 macosx-all,windows-all
 javax/swing/JMenuItem/6249972/bug6249972.java                                       8197552 macosx-all,windows-all,linux-all
 javax/swing/JPopupMenu/4458079/bug4458079.java                                      8040917 macosx-all
+javax/swing/JPopupMenu/4769039/bug4769039.java                                      8194045 generic-all
 javax/swing/JPopupMenu/4870644/bug4870644.java                                      8194130 macosx-all,linux-all
 javax/swing/JPopupMenu/4966112/bug4966112.java                                      8064915,7151826 macosx-all,linux-all
+javax/swing/JPopupMenu/6217905/bug6217905.java                                      8205518 windows-all
 javax/swing/JPopupMenu/6415145/bug6415145.java                                      8197552 macosx-all,windows-all,linux-all
 javax/swing/JPopupMenu/6495920/bug6495920.java                                      8072110 macosx-all,linux-all
 javax/swing/JPopupMenu/6515446/bug6515446.java                                      8197552 macosx-all,windows-all,linux-all
-javax/swing/JPopupMenu/6580930/bug6580930.java                                      8196096 windows-all,macosx-all
+javax/swing/JPopupMenu/6580930/bug6580930.java                                      8196096 windows-all,linux-all,macosx-all
 javax/swing/JPopupMenu/6583251/bug6583251.java                                      8213564 linux-all
 javax/swing/JPopupMenu/6675802/bug6675802.java                                      8196097 windows-all
-javax/swing/JPopupMenu/6800513/bug6800513.java                                      7184956,8080868 macosx-all,windows-all
+javax/swing/JPopupMenu/6800513/bug6800513.java                                      7184956,8080868 macosx-all,windows-all,linux-all
 javax/swing/JPopupMenu/6987844/bug6987844.java                                      8169956 macosx-all,windows-all
 javax/swing/JPopupMenu/7156657/bug7156657.java                                      8171381 macosx-all,windows-all
 javax/swing/JPopupMenu/8075063/ContextMenuScrollTest.java                           8202880 linux-all,windows-all,macosx-all
 javax/swing/JRadioButton/8033699/bug8033699.java                                    8197552,8064920 macosx-all,windows-all,linux-all
+javax/swing/JRadioButton/8041561/bug8041561.java                                    8194941 linux-all
 javax/swing/JRadioButton/8075609/bug8075609.java                                    8197552 macosx-all,windows-all,linux-all
 javax/swing/JRadioButton/ButtonGroupFocus/ButtonGroupFocusTest.java                 8197552 macosx-all,windows-all,linux-all
+javax/swing/JRadioButton/FocusTraversal/FocusTraversal.java                         8221902 windows-all,linux-all (windows: commit testing)
 javax/swing/JRootPane/4670486/bug4670486.java                                       8197552 macosx-all,windows-all,linux-all
 javax/swing/JScrollBar/4708809/bug4708809.java                                      8169957,8072110 macosx-all,windows-all,linux-all
 javax/swing/JScrollBar/6924059/bug6924059.java                                      8199078 generic-all
@@ -982,7 +1002,7 @@ javax/swing/JSlider/6348946/bug6348946.java
 javax/swing/JSpinner/4973721/bug4973721.java                                        8197552,8172408,8072110 macosx-all,windows-all,linux-all
 javax/swing/JSpinner/5012888/bug5012888.java                                        8169958 windows-all
 javax/swing/JSplitPane/4201995/bug4201995.java                                      8079127 generic-all
-javax/swing/JSplitPane/4885629/bug4885629.java                                      8019935 macosx-all
+javax/swing/JSplitPane/4885629/bug4885629.java                                      8019935,8194941 macosx-all,linux-all,windows-all (windows: commit testing)
 javax/swing/JTabbedPane/4361477/bug4361477.java                                     8170260 macosx-all,windows-all
 javax/swing/JTabbedPane/4624207/bug4624207.java                                     8197552,8064922 macosx-all,windows-all,linux-all
 javax/swing/JTabbedPane/7024235/Test7024235.java                                    8028281 macosx-all
@@ -996,6 +1016,7 @@ javax/swing/JTable/8133919/DrawGridLinesTest.java
 javax/swing/JTableHeader/6884066/bug6884066.java                                    8169952 macosx-all,windows-all
 javax/swing/JTableHeader/6889007/bug6889007.java                                    8197552,7179842 macosx-all,windows-all,linux-all
 javax/swing/JTextArea/TextViewOOM/TextViewOOM.java                                  8167355 generic-all
+javax/swing/JTextField/4306756/bug4306756.java                                      8194045 generic-all
 javax/swing/JTextField/8036819/bug8036819.java                                      8197552 macosx-all,windows-all,linux-all
 javax/swing/JToolTip/4846413/bug4846413.java                                        8172407 macosx-all,windows-all
 javax/swing/JTree/4330357/bug4330357.java                                           8029682,8003839 macosx-all,windows-all
@@ -1007,11 +1028,11 @@ javax/swing/JTree/8003400/Test8003400.java
 javax/swing/JTree/8003830/bug8003830.java                                           8199057 generic-all
 javax/swing/JTree/DnD/LastNodeLowerHalfDrop.java                                    8159131 macosx-all,windows-all,linux-all
 javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucentCanvas.java      8081476 windows-all,macosx-all
-javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucentSwing.java       8194128 macosx-all
+javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucentSwing.java       8194128 macosx-all,linux-all,windows-all
 javax/swing/JWindow/ShapedAndTranslucentWindows/ShapedPerPixelTranslucentGradient.java 8198667 macosx-all
 javax/swing/JWindow/ShapedAndTranslucentWindows/ShapedTranslucentPerPixelTranslucentGradient.java 8079254 linux-all
 javax/swing/JWindow/ShapedAndTranslucentWindows/SetShapeAndClickSwing.java          8013450 macosx-all,windows-all
-javax/swing/JWindow/ShapedAndTranslucentWindows/TranslucentJComboBox.java           8024627 macosx-all
+javax/swing/JWindow/ShapedAndTranslucentWindows/TranslucentJComboBox.java           8024627 macosx-all,windows-all
 javax/swing/LookAndFeel/8145547/DemandGTK2.sh                                       8193546,8212903 linux-all
 javax/swing/LookAndFeel/8145547/DemandGTK3.sh                                       8215539,8212903 linux-all
 javax/swing/MultiUIDefaults/4300666/bug4300666.java                                 7105119 macosx-all
@@ -1041,32 +1062,34 @@ javax/swing/dnd/8139050/NativeErrorsInTableDnD.java
 javax/swing/plaf/basic/BasicComboBoxEditor/Test8015336.java                         8198394 generic-all
 javax/swing/plaf/basic/BasicComboPopup/JComboBoxPopupLocation/JComboBoxPopupLocation.java 8194945 macosx-all,linux-all,windows-all
 javax/swing/plaf/basic/BasicGraphicsUtils/8132119/bug8132119.java                   8196434 linux-all,solaris-all
-javax/swing/plaf/basic/BasicHTML/4251579/bug4251579.java                            8198905,8137101 macosx-all,windows-all
+javax/swing/plaf/basic/BasicHTML/4251579/bug4251579.java                            8198905,8137101 macosx-all,windows-all,linux-all
 javax/swing/plaf/basic/BasicMenuUI/4983388/bug4983388.java                          8042383 macosx-all,windows-all
 javax/swing/plaf/basic/BasicTextUI/8001470/bug8001470.java                          8196098 windows-all,linux-all
 javax/swing/plaf/basic/BasicTreeUI/8023474/bug8023474.java                          8172887 windows-all
 javax/swing/plaf/basic/Test6984643.java                                             8198340 windows-all
 javax/swing/plaf/metal/MetalGradient/8163193/ButtonGradientTest.java                8194941 linux-all
 javax/swing/plaf/metal/MetalLookAndFeel/Test8039750.java                            8198395 generic-all
+javax/swing/plaf/nimbus/8041642/ScrollBarThumbVisibleTest.java                      8194941 linux-all
 javax/swing/plaf/nimbus/ColorCustomizationTest.java                                 8199080 generic-all
 javax/swing/plaf/synth/7158712/bug7158712.java                                      8170722 macosx-all,windows-all
 javax/swing/plaf/windows/WindowsRootPaneUI/WrongAltProcessing/WrongAltProcessing.java 8021007,8172071 windows-all
 javax/swing/text/AbstractDocument/DocumentInsert/DocumentInsertAtWrongPositionTest.java 8198396 generic-all
-javax/swing/text/CSSBorder/6796710/bug6796710.java                                  8196099 macosx-all,linux-all
+javax/swing/text/CSSBorder/6796710/bug6796710.java                                  8196099 windows-all,macosx-all,linux-all
 javax/swing/text/DefaultCaret/6938583/bug6938583.java                               8199058 generic-all
-javax/swing/text/DefaultCaret/HidingSelection/HidingSelectionTest.java              8194048 windows-all
+javax/swing/text/DefaultCaret/HidingSelection/HidingSelectionTest.java              8194048,8194941 windows-all,linux-all
 javax/swing/text/DefaultCaret/HidingSelection/MultiSelectionTest.java               8213562 linux-all
-javax/swing/text/DefaultEditorKit/4278839/bug4278839.java                           8196099,7190589 windows-all,macosx-all
-javax/swing/tree/DefaultTreeCellRenderer/7142955/bug7142955.java                    8199076 generic-all
+javax/swing/text/DefaultEditorKit/4278839/bug4278839.java                           8196099,7190589 windows-all,macosx-all,linux-all
 javax/swing/text/DevanagariEditor.java                                              8198397 generic-all
 javax/swing/text/GlyphPainter2/6427244/bug6427244.java                              8050988 generic-all
 javax/swing/text/JTextComponent/5074573/bug5074573.java                             7153690,8196100,8196100,8072110 macosx-all,windows-all,linux-all
-javax/swing/text/StyledEditorKit/4506788/bug4506788.java                            8214220,8172887 macosx-all,windows-all
+javax/swing/text/StyledEditorKit/4506788/bug4506788.java                            8214220,8172887 macosx-all,windows-all,linux-all
 javax/swing/text/StyledEditorKit/8016833/bug8016833.java                            8199055 generic-all
+javax/swing/text/TableView/TableViewLayoutTest.java                                 8194936 linux-all
 javax/swing/text/Utilities/8134721/bug8134721.java                                  8199062 generic-all
 javax/swing/text/Utilities/8142966/SwingFontMetricsTest.java                        8199529 windows-all
 javax/swing/text/View/8014863/bug8014863.java                                       8072110 windows-all,linux-all
-javax/swing/text/html/HTMLEditorKit/5043626/bug5043626.java                         8072110 windows-all
+javax/swing/text/html/CSS/4530474/bug4530474.java                                   8194941 linux-all
+javax/swing/text/html/HTMLEditorKit/5043626/bug5043626.java                         8072110 windows-all,linux-all
 javax/swing/text/html/StyleSheet/BackgroundImage/BackgroundImagePosition.java       8198409 generic-all
 javax/swing/text/html/StyleSheet/bug4936917.java                                    8208569 macosx-all
 javax/swing/text/html/parser/Parser/6836089/bug6836089.java                         8198401 generic-all
@@ -1074,6 +1097,8 @@ javax/swing/text/html/parser/Test8017492.java
 javax/swing/text/html/parser/Parser/6990651/bug6990651.java                         8199060 generic-all
 javax/swing/text/html/parser/Parser/8078268/bug8078268.java                         8199092 generic-all
 javax/swing/text/html/parser/Parser/HtmlCommentTagParseTest/HtmlCommentTagParseTest.java 8199073 generic-all
+javax/swing/tree/DefaultTreeCellRenderer/6225504/bug6225504.java                    8194045 generic-all
+javax/swing/tree/DefaultTreeCellRenderer/7142955/bug7142955.java                    8199076 generic-all
 
 sanity/client/SwingSet/src/ButtonDemoScreenshotTest.java                            8198920 macosx-all,linux-all,windows-all
 
@@ -1091,6 +1116,7 @@ sanity/client/SwingSet/src/ButtonDemoScreenshotTest.java
 # core_tools
 
 tools/pack200/CommandLineTests.java                                                 8059906 generic-all
+tools/jimage/JImageExtractTest.java                                                 8216535 windows-all
 
 ############################################################################
 
@@ -1098,6 +1124,7 @@ tools/pack200/CommandLineTests.java
 
 com/sun/jdi/BasicJDWPConnectionTest.java                                            8195703 generic-all
 com/sun/jdi/RedefineImplementor.sh                                                  8004127 generic-all
+com/sun/jdi/FieldWatchpoints.java                                                   8206438 generic-all
 com/sun/jdi/Frames2Test.java                                                        JRE-1165 generic-all
 com/sun/jdi/JdbExprTest.sh                                                          8203393 solaris-all
 com/sun/jdi/JdbMethodExitTest.sh                                                    8203393 solaris-all
@@ -1116,6 +1143,7 @@ com/sun/jdi/NashornPopFrameTest.java
 
 ############################################################################
 
+java/util/concurrent/tck/JSR166TestCase.java                                        8186076 windows-all
 java/util/zip/ZipFile/TestCleaner.java                                              8204868 generic-all
 
 # jdk_instrument
@@ -1125,6 +1153,7 @@ java/util/zip/ZipFile/TestCleaner.java
 # svc_tools
 
 sun/tools/jstat/jstatClassloadOutput1.sh                                            8173942 generic-all
+sun/tools/jstatd/TestJstatdExternalRegistry.java                                    8165727 windows-all,linux-all
 sun/tools/jstatd/TestJstatdPortAndServer.java                                       8081569 generic-all
 sun/tools/jstatd/TestJstatdDefaults.java                                            8081569 generic-all
 sun/tools/jstatd/TestJstatdServer.java                                              8081569 generic-all
@@ -1150,6 +1179,8 @@ com/sun/jdi/RedefineCrossEvent.java
 
 ############################################################################
 
+jdk/internal/platform/cgroup/TestCgroupMetrics.java                                 8222533 linux-all
+
 # jdk_jfr
 
 jdk/jfr/api/recording/event/TestPeriod.java                                         8215890 macosx-all
@@ -1159,7 +1190,9 @@ jdk/jfr/event/oldobject/TestLargeRootSet.java
 jdk/jfr/event/os/TestSystemProcess.java                                             8202835 linux-all
 jdk/jfr/startupargs/TestMemoryOptions.java                                          8207970 linux-all
 
-sun/nio/ch/TestMaxCachedBufferSize.java                                             8212812 generic-all
+lib/security/cacerts/VerifyCACerts.java                                             8212812 generic-all
+
+sun/nio/ch/TestMaxCachedBufferSize.java                                             8207321 generic-all
 
 demo/jfc/J2Ddemo/J2DdemoTest.java                                                   8213118 generic-all
 
@@ -1178,24 +1211,18 @@ javax/print/attribute/GetCopiesSupported.java
 javax/print/attribute/SidesPageRangesTest.java                                      generic-all
 javax/print/attribute/SupportedPrintableAreas.java                                  generic-all
 
-# https://youtrack.jetbrains.com/issue/JRE-948
-
-java/awt/Component/F10TopToplevel/F10TopToplevel.html
-java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeNextMnemonicKeyTypedTest.html JRE-948 macosx-all
-java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeForModalDialogTest/ConsumeForModalDialogTest.html JRE-948 macosx-all
-java/awt/KeyboardFocusmanager/TypeAhead/MenuItemActivatedTest/MenuItemActivatedTest.html JRE-948 macosx-all
-java/awt/KeyboardFocusmanager/TypeAhead/MenuItemActivatedTest/MenuItemActivatedTest.java JRE-948 macosx-all
-java/awt/List/EmptyListEventTest/EmptyListEventTest.java                            JRE-948 macosx-all,windows-all (windows: commit testing)
-java/awt/event/KeyEvent/8020209/bug8020209.java                                     JRE-948 macosx-all
-java/awt/event/KeyEvent/KeyTyped/CtrlASCII.html                                     JRE-948 macosx-all
-java/awt/event/KeyEvent/RobotCrash/RobotCrash.java                                  JRE-948 macosx-all
-javax/swing/JComboBox/4515752/DefaultButtonTest.java                                JRE-948 macosx-all
-javax/swing/JTabbedPane/7161568/bug7161568.java                                     JRE-948 macosx-all
-javax/swing/JTable/4220171/bug4220171.java                                          JRE-948 macosx-all
-javax/swing/JTable/7055065/bug7055065.java                                          JRE-948 macosx-all
-javax/swing/JTextArea/4697612/bug4697612.java                                       JRE-948,8159253 macosx-all,windows-all,linux-all
-javax/swing/JTree/6578666/bug6578666.java                                           JRE-948 macosx-all
-javax/swing/text/DefaultStyledDocument/6636983/bug6636983.java                      JRE-948 macosx-all
-javax/swing/text/TableView/TableViewLayoutTest.java                                 JRE-948 macosx-all
-javax/swing/JComboBox/4199622/bug4199622.java                                       JRE-948 macosx-all
-java/awt/event/MouseEvent/MouseWheelEventAbsoluteCoordsTest/MouseWheelEventAbsoluteCoordsTest.html JRE-948 macosx-all
+tools/jlink/DefaultProviderTest.java                                                nobug windows-6.1 fails on Windows 7 only
+tools/jlink/JLinkTest.java                                                          nobug windows-6.1 fails on Windows 7 only
+tools/jlink/JLink2Test.java                                                         nobug windows-6.1 fails on Windows 7 only
+tools/jlink/JLinkNegativeTest.java                                                  nobug windows-6.1 fails on Windows 7 only
+tools/jlink/JLinkPluginsTest.java                                                   nobug windows-6.1 fails on Windows 7 only
+tools/jlink/JLinkPostProcessingTest.java                                            nobug windows-6.1 fails on Windows 7 only
+tools/jlink/NativeTest.java                                                         nobug windows-6.1 fails on Windows 7 only
+tools/jlink/basic/AllModulePath.java                                                nobug windows-6.1 fails on Windows 7 only
+tools/jlink/basic/BasicTest.java                                                    nobug windows-6.1 fails on Windows 7 only
+tools/jlink/bindservices/BindServices.java                                          nobug windows-6.1 fails on Windows 7 only
+tools/jlink/multireleasejar/JLinkMRJavaBaseVersionTest.java                         nobug windows-6.1 fails on Windows 7 only
+tools/jlink/plugins/IncludeLocalesPluginTest.java                                   nobug windows-6.1 fails on Windows 7 only
+tools/jlink/plugins/SystemModuleDescriptors/CompiledVersionTest.java                nobug windows-6.1 fails on Windows 7 only
+tools/jlink/plugins/SystemModuleDescriptors/UserModuleTest.java                     nobug windows-6.1 fails on Windows 7 only
+tools/launcher/modules/patch/systemmodules/PatchSystemModules.java                  nobug windows-6.1 fails on Windows 7 only

test/jdk/jbcommitProblemList.txt

@@ -1,17 +1,22 @@
 java/awt/Choice/ChoiceLocationTest/ChoiceLocationTest.java                                  nobug macosx-all,linux-all,windows-all
 java/awt/Choice/DragMouseOutAndRelease/DragMouseOutAndRelease.java                          nobug macosx-all,windows-all
 java/awt/Choice/GetSizeTest/GetSizeTest.java                                                nobug macosx-all,windows-all
-java/awt/Choice/ResizeAutoClosesChoice/ResizeAutoClosesChoice.java                          nobug windows-all
-java/awt/Choice/SelectCurrentItemTest/SelectCurrentItemTest.html                            nobug macosx-all,windows-all
+java/awt/Choice/ResizeAutoClosesChoice/ResizeAutoClosesChoice.java                          nobug windows-all,linux-all
+java/awt/Component/F10TopToplevel/F10TopToplevel.html                                       nobug linux-all
+java/awt/Component/PaintAll/PaintAll.java                                                   nobug linux-all
+java/awt/Container/isRemoveNotifyNeeded/JInternalFrameTest.java                             nobug generic-all
 java/awt/Dialog/MakeWindowAlwaysOnTop/MakeWindowAlwaysOnTop.java                            nobug macosx-all,windows-all
 java/awt/Dialog/NestedDialogs/Modal/NestedModalDialogTest.java                              nobug macosx-all,windows-all
-java/awt/Dialog/NestedDialogs/Modeless/NestedModelessDialogTest.java                        nobug macosx-all,windows-all
+java/awt/Dialog/NestedDialogs/Modeless/NestedModelessDialogTest.java                        nobug macosx-all,windows-all,linux-all
+java/awt/Dialog/NonResizableDialogSysMenuResize/NonResizableDialogSysMenuResize.java        nobug macosx-all,windows-all
 java/awt/Dialog/SiblingChildOrder/SiblingChildOrderTest.java                                nobug macosx-all,windows-all
 java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.html                             nobug macosx-all,windows-all
 java/awt/EventDispatchThread/PreserveDispathThread/PreserveDispatchThread.java              nobug windows-all
 java/awt/FileDialog/FileDialogMemoryLeak/FileDialogLeakTest.java                            nobug windows-all
 java/awt/FileDialog/FilenameFilterTest/FilenameFilterTest.html                              nobug macosx-all
 java/awt/FileDialog/MoveToTrashTest.java                                                    nobug windows-all
+java/awt/FileDialog/ModalFocus/FileDialogModalFocusTest.java                                nobug linux-all,windows-all
+java/awt/Focus/6981400/Test2.java                                                           nobug linux-all
 java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest1.html                          nobug linux-all,windows-all
 java/awt/FileDialog/ModalFocus/FileDialogModalFocusTest.java                                nobug linux-all,windows-all
 java/awt/Focus/ConsumeNextKeyTypedOnModalShowTest/ConsumeNextKeyTypedOnModalShowTest.java   nobug macosx-all,linux-all,windows-all
@@ -20,52 +25,60 @@ java/awt/Focus/DisposedWindow/DisposeDialogNotActivateOwnerTest/DisposeDialogNot
 java/awt/Focus/FocusEmbeddedFrameTest/FocusEmbeddedFrameTest.java                           nobug windows-all
 java/awt/Focus/FocusTransitionTest/FocusTransitionTest.java                                 nobug macosx-all,windows-all
 java/awt/Focus/InputVerifierTest3/InputVerifierTest3.java                                   nobug macosx-all
-java/awt/Focus/ModalExcludedWindowClickTest/ModalExcludedWindowClickTest.html               nobug macosx-all,windows-all
 java/awt/Focus/NonFocusableResizableTooSmall/NonFocusableResizableTooSmall.java             nobug windows-all
-java/awt/Focus/NonFocusableWindowTest/NonfocusableOwnerTest.java                            nobug macosx-all,windows-all
+java/awt/Focus/NonFocusableWindowTest/NonfocusableOwnerTest.java                            nobug macosx-all,windows-all,linux-all
 java/awt/Focus/RemoveAfterRequest/RemoveAfterRequest.java                                   nobug macosx-all
 java/awt/Focus/RequestFocusAndHideTest/RequestFocusAndHideTest.java                         nobug macosx-all
+java/awt/Focus/RequestFocusByCause/RequestFocusByCauseTest.java                             nobug linux-all,windows-all reproduced with Adopt, OpenJDK
 java/awt/Focus/WindowIsFocusableAccessByThreadsTest/WindowIsFocusableAccessByThreadsTest.java nobug macosx-all,windows-all
-java/awt/FontClass/GlyphRotationTest.java                                                   nobug windows-all
+java/awt/Frame/8158918/SetExtendedState.java                                                nobug linux-all
+java/awt/Frame/FrameLocation/FrameLocation.java                                             nobug linux-all
+java/awt/Frame/FrameSize/TestFrameSize.java                                                 nobug linux-all,mac-osx
 java/awt/Frame/MaximizedToIconified/MaximizedToIconified.java                               nobug linux-all,windows-all
 java/awt/Frame/MiscUndecorated/ActiveAWTWindowTest.java                                     nobug macosx-all,windows-all
 java/awt/Frame/MiscUndecorated/ActiveSwingWindowTest.java                                   nobug macosx-all,windows-all
 java/awt/Frame/MiscUndecorated/FrameCloseTest.java                                          nobug macosx-all,windows-all
-java/awt/Frame/MiscUndecorated/RepaintTest.java                                             nobug macosx-all,windows-all
 java/awt/Frame/NormalToIconified/NormalToIconifiedTest.java                                 nobug linux-all,windows-all
-java/awt/Frame/ObscuredFrame/ObscuredFrameTest.java                                         nobug linux-all
+java/awt/Frame/ObscuredFrame/ObscuredFrameTest.java                                         nobug macosx-all,linux-all
 java/awt/Frame/UnfocusableMaximizedFrameResizablity/UnfocusableMaximizedFrameResizablity.java nobug linux-all,windows-all,macosx-all
-java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java                               nobug macosx-all,windows-all
 java/awt/FullScreen/BufferStrategyExceptionTest/BufferStrategyExceptionTest.java            nobug macosx-all,linux-all,windows-all
 java/awt/FullScreen/SetFSWindow/FSFrame.java                                                nobug windows-all
 java/awt/FullScreen/TranslucentWindow/TranslucentWindow.java                                nobug windows-all
 java/awt/Graphics/LineClipTest.java                                                         nobug macosx-all,windows-all
 java/awt/Graphics2D/ScaledTransform/ScaledTransform.java                                    nobug macosx-all,linux-all,windows-all
 java/awt/JAWT/JAWT.sh                                                                       nobug linux-all,windows-all
-java/awt/KeyboardFocusmanager/TypeAhead/EnqueueWithDialogTest/EnqueueWithDialogTest.java    nobug macosx-all,windows-all
+java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeNextMnemonicKeyTypedTest.html nobug macosx-all,windows-all
+java/awt/KeyboardFocusmanager/TypeAhead/EnqueueWithDialogTest/EnqueueWithDialogTest.java    nobug macosx-all,windows-all,linux-all
+java/awt/KeyboardFocusmanager/TypeAhead/MenuItemActivatedTest/MenuItemActivatedTest.html    nobug windows-all reproduced with Adopt
 java/awt/LightweightDispatcher/LWDispatcherMemoryLeakTest.java                              nobug windows-all
 java/awt/List/ActionAfterRemove/ActionAfterRemove.java                                      nobug windows-all
+java/awt/List/ActionEventTest/ActionEventTest.java                                          nobug linux-all
+java/awt/List/EmptyListEventTest/EmptyListEventTest.java                                    nobug windows-all
 java/awt/List/ItemEventTest/ItemEventTest.java                                              nobug macosx-all,windows-all
 java/awt/List/NofocusListDblClickTest/NofocusListDblClickTest.java                          nobug macosx-all,windows-all
 java/awt/List/ListGarbageCollectionTest/AwtListGarbageCollectionTest.java                   nobug linux-all
+java/awt/Menu/NullMenuLabelTest/NullMenuLabelTest.java                                      nobug linux-all
 java/awt/Mixing/AWT_Mixing/OpaqueOverlapping.java                                           nobug macosx-all,windows-all
 java/awt/Mixing/AWT_Mixing/ViewportOverlapping.java                                         nobug macosx-all,windows-all
 java/awt/Mixing/HWDisappear.java                                                            nobug macosx-all,windows-all
 java/awt/Mixing/JButtonInGlassPane.java                                                     nobug macosx-all,linux-all,windows-all
+java/awt/Mixing/LWComboBox.java                                                             nobug macosx-all,linux-all,windows-all
 java/awt/Mixing/LWPopupMenu.java                                                            nobug macosx-all,windows-all
 java/awt/Mixing/MixingInHwPanel.java                                                        nobug macosx-all,windows-all
 java/awt/Mixing/ValidBounds.java                                                            nobug macosx-all,windows-all
-java/awt/Mixing/Validating.java                                                             nobug macosx-all,windows-all
+java/awt/Mixing/Validating.java                                                             nobug macosx-all,windows-all,linux-all
 java/awt/Modal/LWModalTest/LWModalTest.java                                                 nobug macosx-all,windows-all
 java/awt/Modal/ModalDialogOrderingTest/ModalDialogOrderingTest.java                         nobug macosx-all,windows-all
 java/awt/Modal/ToBack/ToBackModeless6Test.java                                              nobug macosx-all,linux-all,windows-all
-java/awt/Mouse/MouseComboBoxTest/MouseComboBoxTest.java                                     nobug macosx-all,windows-all
-java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersUnitTest_Extra.java                     nobug windows-all
+java/awt/Mouse/MouseComboBoxTest/MouseComboBoxTest.java                                     nobug macosx-all,windows-all,linux-all
+java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersUnitTest_Extra.java                     nobug macosx-all,linux-all,windows-all
 java/awt/Mouse/MouseWheelAbsXY/MouseWheelAbsXY.java                                         nobug macosx-all,windows-all
 java/awt/MouseAdapter/MouseAdapterUnitTest/MouseAdapterUnitTest.java                        nobug macosx-all,windows-all
 java/awt/MouseInfo/ComponentMousePositionTest.java                                          nobug macosx-all,windows-all
 java/awt/MouseInfo/JContainerMousePositionTest.java                                         nobug macosx-all,windows-all
+java/awt/Paint/ComponentIsNotDrawnAfterRemoveAddTest/ComponentIsNotDrawnAfterRemoveAddTest.java nobug linux-all,macosx-all,windows-all
 java/awt/Paint/ExposeOnEDT.java                                                             nobug windows-all
+java/awt/Paint/ListRepaint.java                                                             nobug linux-all (java.lang.NullPointerException reproduced with Adopt)
 java/awt/PopupMenu/PopupMenuLocation.java                                                   nobug macosx-all,linux-all,windows-all
 java/awt/Robot/HiDPIMouseClick/HiDPIRobotMouseClick.java                                    nobug windows-all
 java/awt/Robot/HiDPIScreenCapture/HiDPIRobotScreenCaptureTest.java                          nobug windows-all
@@ -81,6 +94,7 @@ java/awt/TextField/OverScrollTest/OverScrollTest.java
 java/awt/Toolkit/RealSync/Test.java                                                         nobug macosx-all,linux-all,windows-all
 java/awt/Toolkit/SunDisplayChangerLeakTest/SunDisplayChangerLeakTest.java                   nobug macosx-all,linux-all,windows-all
 java/awt/TrayIcon/SecurityCheck/FunctionalityCheck/FunctionalityCheck.java                  nobug macosx-all,windows-all
+java/awt/Window/ChangeWindowResizabilty/ChangeWindowResizabiltyTest.java                    nobug windows-all,linux-all
 java/awt/Window/FindOwner/FindOwnerTest.html                                                nobug macosx-all,windows-all
 java/awt/Window/GetScreenLocation/GetScreenLocationTest.java                                nobug macosx-all,linux-all,windows-all
 java/awt/Window/MainKeyWindowTest/TestMainKeyWindow.java                                    nobug macosx-all
@@ -90,19 +104,21 @@ java/awt/Window/ScreenLocation/ScreenLocationTest.java
 java/awt/Window/SetWindowLocationByPlatformTest/SetWindowLocationByPlatformTest.java        nobug linux-all
 java/awt/Window/ShapedAndTranslucentWindows/Translucent.java                                nobug windows-all
 java/awt/Window/ShapedAndTranslucentWindows/WindowOpacity.java                              nobug windows-all
+java/awt/Window/TopLevelLocation/TopLevelLocation.java                                      nobug linux-all,macosx-all
 java/awt/Window/WindowOwnedByEmbeddedFrameTest/WindowOwnedByEmbeddedFrameTest.java          nobug macosx-all
 java/awt/Window/WindowResizing/DoubleClickTitleBarTest.java                                 nobug macosx-all
 java/awt/datatransfer/Independence/IndependenceAWTTest.java                                 nobug linux-all
 java/awt/datatransfer/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.html                          nobug macosx-all,windows-all
 java/awt/datatransfer/SystemSelection/SystemSelectionSwingTest.java                         nobug linux-all
+java/awt/dnd/AcceptDropMultipleTimes/AcceptDropMultipleTimes.java                           nobug macosx-all,windows-all,linux-all
 java/awt/dnd/DragInterceptorAppletTest/DragInterceptorAppletTest.html                       nobug macosx-all,linux-all,windows-all
-java/awt/dnd/DnDTestWithHIDPI/DragTestWithHIDPI.java                                        nobug macosx-all,windows-all
+java/awt/dnd/DnDTestWithHIDPI/DragTestWithHIDPI.java                                        nobug macosx-all,windows-all,linux-all
 java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.html                           nobug macosx-all,linux-all,windows-all
-java/awt/dnd/InterJVMGetDropSuccessTest/InterJVMGetDropSuccessTest.html                     nobug macosx-all,windows-all
-java/awt/dnd/RecognizedActionTest/RecognizedActionTest.java                                 nobug macosx-all,windows-all
+java/awt/dnd/InterJVMGetDropSuccessTest/InterJVMGetDropSuccessTest.html                     nobug macosx-all,windows-all,linux-all
+java/awt/dnd/RecognizedActionTest/RecognizedActionTest.java                                 nobug macosx-all,windows-all,linux-all
 java/awt/dnd/RemoveDropTargetCrashTest/RemoveDropTargetCrashTest.java                       nobug macosx-all,windows-all
 java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.html                             nobug macosx-all,linux-all
-java/awt/event/KeyEvent/AltCharAcceleratorTest/AltCharAcceleratorTest.java                  nobug macosx-all,windows-all
+java/awt/event/KeyEvent/AltCharAcceleratorTest/AltCharAcceleratorTest.java                  nobug macosx-all,windows-all,linux-all
 java/awt/event/KeyEvent/DeadKey/DeadKeyMacOSXInputText.java                                 nobug macosx-all
 java/awt/event/KeyEvent/DeadKey/deadKeyMacOSX.java                                          nobug macosx-all
 java/awt/event/KeyEvent/ExtendedKeyCode/ExtendedKeyCodeTest.java                            nobug macosx-all,windows-all
@@ -110,17 +126,17 @@ java/awt/event/KeyEvent/KeyChar/KeyCharTest.java
 java/awt/event/KeyEvent/KeyTyped/CtrlASCII.html                                             nobug linux-all,windows-all
 java/awt/event/KeyEvent/RobotCrash/RobotCrash.java                                          nobug linux-all,windows-all
 java/awt/event/KeyEvent/SwallowKeyEvents/SwallowKeyEvents.java                              nobug macosx-all,linux-all
-java/awt/event/MouseEvent/ClickDuringKeypress/ClickDuringKeypress.java                      nobug macosx-all,windows-all
+java/awt/event/MouseEvent/ClickDuringKeypress/ClickDuringKeypress.java                      nobug macosx-all,windows-all,linux-all
 java/awt/event/MouseEvent/EnterAsGrabbedEvent/EnterAsGrabbedEvent.java                      nobug macosx-all,windows-all
 java/awt/event/MouseEvent/MouseButtonsTest/MouseButtonsTest.java                            nobug macosx-all,linux-all,windows-all
 java/awt/event/MouseEvent/MultipleMouseButtonsTest/MultipleMouseButtonsTest.java            nobug macosx-all,windows-all
 java/awt/event/MouseEvent/RobotLWTest/RobotLWTest.html                                      nobug macosx-all,windows-all
-java/awt/event/MouseWheelEvent/WheelModifier/WheelModifier.java                             nobug macosx-all,windows-all
-java/awt/event/SequencedEvent/SequencedEventTest.java                                       nobug macosx-all,windows-all
+java/awt/event/MouseWheelEvent/DisabledComponent/DisabledComponent.java                     nobug windows-all
+java/awt/event/MouseWheelEvent/WheelModifier/WheelModifier.java                             nobug macosx-all,windows-all,linux-all
+java/awt/event/SequencedEvent/SequencedEventTest.java                                       nobug macosx-all,windows-all,linux-all
 java/awt/font/Emoji/EmojiDrawingTest.java                                                   nobug macosx-all
 java/awt/font/Outline/OutlineInvarianceTest.java                                            nobug linux-all,windows-all
 java/awt/grab/EmbeddedFrameTest1/EmbeddedFrameTest1.java                                    nobug macosx-all,windows-all
-java/awt/grab/GrabOnUnfocusableToplevel/GrabOnUnfocusableToplevel.java                      nobug macosx-all,windows-all
 java/awt/grab/MenuDragEvents/MenuDragEvents.java                                            nobug macosx-all,windows-all
 java/awt/hidpi/ClientAreaOriginWindowsTest.java                                             nobug windows-all
 java/awt/hidpi/DrawOnFrameGraphicsTest.java                                                 nobug windows-all
@@ -135,22 +151,26 @@ java/awt/image/VolatileImage/TransparentVImage.java
 java/awt/image/multiresolution/Corrupted2XImageTest.java                                    nobug macosx-all
 java/awt/image/multiresolution/MenuMultiresolutionIconTest.java                             nobug macosx-all,windows-all
 java/awt/keyboard/AltPlusNumberKeyCombinationsTest/AltPlusNumberKeyCombinationsTest.java    nobug windows-all
-java/awt/print/PaintSetEnabledDeadlock/PaintSetEnabledDeadlock.java                         nobug windows-all
+java/awt/print/PaintSetEnabledDeadlock/PaintSetEnabledDeadlock.java                         nobug windows-all,linux-all
 
-javax/swing/JButton/8151303/PressedIconTest.java                                            nobug windows-all
 javax/swing/JComboBox/4199622/bug4199622.java                                               nobug windows-all
 javax/swing/JComboBox/4523758/bug4523758.java                                               nobug macosx-all,windows-all
-javax/swing/JDialog/Transparency/TransparencyTest.java                                      nobug macosx-all,windows-all
+javax/swing/JDialog/Transparency/TransparencyTest.java                                      nobug linux-all,macosx-all,windows-all
 javax/swing/JEditorPane/JEditorPaneGCSwitchTest/JEditorPaneGCSwitchTest.java                nobug windows-all
 javax/swing/JEditorPane/JEditorPaneGCSwitchTest/JEditorPaneGCSwitchTest_i18n.java           nobug windows-all
 javax/swing/JFileChooser/6489130/bug6489130.java                                            nobug macosx-all
 javax/swing/JFileChooser/8194044/FileSystemRootTest.java                                    nobug windows-all
 javax/swing/JFrame/4962534/bug4962534.html                                                  nobug macosx-all,windows-all
+javax/swing/JInternalFrame/4769772/TestJInternalFrameIconify.java                           nobug macosx-all
 javax/swing/JInternalFrame/6288609/TestJInternalFrameDispose.java                           nobug macosx-all,windows-all
 javax/swing/JInternalFrame/6647340/bug6647340.java                                          nobug macosx-all,windows-all
 javax/swing/JInternalFrame/6725409/bug6725409.java                                          nobug windows-all
-javax/swing/JInternalFrame/8020708/bug8020708.java                                          nobug windows-all
-javax/swing/JInternalFrame/8145060/TestJInternalFrameMinimize.java                          nobug macosx-all,windows-all
+javax/swing/JInternalFrame/8020708/bug8020708.java                                          nobug windows-all,linux-all
+javax/swing/JInternalFrame/8145060/TestJInternalFrameMinimize.java                          nobug macosx-all,linux-all,windows-all
+javax/swing/JInternalFrame/InternalFrameIsNotCollectedTest.java                             nobug macosx-all
+javax/swing/JInternalFrame/Test6802868.java                                                 nobug macosx-all,linux-all
+javax/swing/JLabel/7004134/bug7004134.java                                                  nobug macosx-all,linux-all
+javax/swing/JList/6510999/bug6510999.java                                                   nobug linux-all,macosx-all,windows-all
 javax/swing/JList/BasicListTest.java                                                        nobug macosx-all
 javax/swing/JMenu/6538132/bug6538132.java                                                   nobug windows-all
 javax/swing/JMenuItem/8139169/ScreenMenuBarInputTwice.java                                  nobug macosx-all
@@ -158,26 +178,21 @@ javax/swing/JMenuItem/8158566/CloseOnMouseClickPropertyTest.java
 javax/swing/JOptionPane/6428694/bug6428694.java                                             nobug windows-all
 javax/swing/JPopupMenu/4458079/bug4458079.java                                              nobug windows-all
 javax/swing/JPopupMenu/4634626/bug4634626.java                                              nobug windows-all
-javax/swing/JPopupMenu/6217905/bug6217905.java                                              nobug windows-all
 javax/swing/JPopupMenu/6544309/bug6544309.java                                              nobug linux-all,windows-all
 javax/swing/JPopupMenu/6827786/bug6827786.java                                              nobug windows-all
 javax/swing/JProgressBar/8015748/JProgressBarOrientationRobotTest.java                      nobug macosx-all
 javax/swing/JRadioButton/8041561/bug8041561.java                                            nobug windows-all
-javax/swing/JRadioButton/FocusTraversal/FocusTraversal.java                                 nobug windows-all
 javax/swing/JScrollBar/7163696/Test7163696.java                                             nobug windows-all
 javax/swing/JScrollBar/bug4202954/bug4202954.java                                           nobug windows-all
 javax/swing/JSlider/6401380/bug6401380.java                                                 nobug windows-all
-javax/swing/JSplitPane/4885629/bug4885629.java                                              nobug windows-all
 javax/swing/JTabbedPane/7161568/bug7161568.java                                             nobug windows-all
 javax/swing/JTextArea/8149849/DNDTextToScaledArea.java                                      nobug windows-all
 javax/swing/JToolTip/6219960/bug6219960.java                                                nobug macosx-all,windows-all
 javax/swing/JTree/4633594/JTreeFocusTest.java                                               nobug macosx-all,windows-all
 javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucent.java                    nobug windows-all
 javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucentGradient.java            nobug windows-all
-javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucentSwing.java               nobug macosx-all,linux-all,windows-all
 javax/swing/JWindow/ShapedAndTranslucentWindows/ShapedPerPixelTranslucentGradient.java      nobug macosx-all,linux-all,windows-all
 javax/swing/JWindow/ShapedAndTranslucentWindows/ShapedTranslucentPerPixelTranslucentGradient.java nobug macosx-all,windows-all
-javax/swing/JWindow/ShapedAndTranslucentWindows/TranslucentJComboBox.java                   nobug macosx-all,windows-all
 javax/swing/JWindow/ShapedAndTranslucentWindows/TranslucentPerPixelTranslucentGradient.java nobug windows-all
 javax/swing/JWindow/ShapedAndTranslucentWindows/TranslucentWindowClickSwing.java            nobug windows-all
 javax/swing/event/RightAltKeyTest.java                                                      nobug windows-all
@@ -192,6 +207,7 @@ javax/swing/plaf/windows/6921687/bug6921687.java
 javax/swing/reliability/TaskUndJFrameProperties.java                                        nobug windows-all
 javax/swing/reliability/TaskZoomJFrameChangeState.java                                      nobug linux-all,windows-all
 javax/swing/reliability/TaskZoomJFrameRepaint.java                                          nobug linux-all,windows-all
+javax/swing/text/Caret/TestCaretPosition.java                                               nobug linux-all
 javax/swing/text/FlowView/LayoutTest.java                                                   nobug windows-all
 javax/swing/text/html/CSS/4530474/bug4530474.java                                           nobug windows-all
 javax/swing/text/html/StyleSheet/bug4936917.java                                            nobug macosx-all,windows-all