Merge branch 'master'

Replaced FT_LOAD_NO_HINTING mode for non AA rendering with FT_LOAD_TARGET_LIGHT

README.md

@@ -4,7 +4,7 @@
 
 |Windows-x64  |macOS        |Linux-x64    |
 |-------------|-------------|-------------|
-|<a href="https://bintray.com/jetbrains/intellij-jdk/openjdk9-windows-x64/_latestVersion"> <img src="https://api.bintray.com/packages/jetbrains/intellij-jdk/openjdk9-windows-x64/images/download.svg"/></a>|<a href="https://bintray.com/jetbrains/intellij-jdk/openjdk9-osx-x64/_latestVersion"> <img src="https://api.bintray.com/packages/jetbrains/intellij-jdk/openjdk9-osx-x64/images/download.svg"/></a>|<a href="https://bintray.com/jetbrains/intellij-jdk/openjdk9-linux-x64/_latestVersion"><img src="https://api.bintray.com/packages/jetbrains/intellij-jdk/openjdk9-linux-x64/images/download.svg"/></a>|
+|[ ![Download](https://api.bintray.com/packages/jetbrains/intellij-jdk/openjdk11-windows-x64/images/download.svg) ](https://bintray.com/jetbrains/intellij-jdk/openjdk11-windows-x64/_latestVersion)|[ ![Download](https://api.bintray.com/packages/jetbrains/intellij-jdk/openjdk11-osx-x64/images/download.svg) ](https://bintray.com/jetbrains/intellij-jdk/openjdk11-osx-x64/_latestVersion)|[ ![Download](https://api.bintray.com/packages/jetbrains/intellij-jdk/openjdk11-linux-x64/images/download.svg) ](https://bintray.com/jetbrains/intellij-jdk/openjdk11-linux-x64/_latestVersion)|
 
 
 # How JetBrains Runtime is organised
@@ -26,6 +26,10 @@ git clone git@github.com:JetBrains/JetBrainsRuntime.git
 ```
 
 # Configure Local Build Environment
+[OpenJDK build docs](http://hg.openjdk.java.net/jdk/jdk11/raw-file/tip/doc/building.html)  
+Tip for all platforms: run ./configure and check output.  
+Usually, it has meaningful advice how to solve your problem.
+
 ## Linux (docker)
 ```
 $ cd jb/project/docker
@@ -51,7 +55,29 @@ $ make images
 ```
 
 ## Windows
-#### TBD
+Install:
+
+* [Cygwin x64](http://www.cygwin.com/)  
+  Required packages: autoconf, binutils, cpio, diffutils, file, gawk, gcc-core, make, m4, unzip, zip.  
+  **Install them while installing cygwin**.
+* Visual Studio compiler toolset [Download](https://visualstudio.microsoft.com/downloads/)  
+  Visual Studio 2015 has support by default.  
+  **Install with desktop development kit, it includes Windows SDK and compilers**.
+* [Java 11](http://www.oracle.com/technetwork/java/javase/downloads/index.html)  
+  If you have problems while configuring [read java tips on cygwin](http://horstmann.com/articles/cygwin-tips.html)
+
+From command line 
+```
+"c:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+"c:\Program_Files\cygwin64\bin\mintty.exe" /bin/bash -l
+```
+First command will set env vars, the second will run cygwin shell with proper environment.  
+In cygwin shell 
+```    
+cd JetBrainsRuntime
+./configure --disable-warnings-as-errors
+make images
+```
 
 ## OSX
 

jb/project/docker/Dockerfile.x86

@@ -0,0 +1,7 @@
+FROM i386/ubuntu:xenial
+
+RUN linux32 apt-get update && apt-get install -y --no-install-recommends apt-utils
+COPY jbrsdk-11.0.5-b1 /jbrsdk-11.0.5-b1
+RUN linux32 apt-get -y install file build-essential zip unzip curl libx11-dev libxext-dev \
+  libxrender-dev libxrandr-dev libxtst-dev libxt-dev libcups2-dev libasound2-data \
+  libpng12-0 libasound2 libfreetype6 libfontconfig1-dev libasound2-dev autoconf

jb/project/jdk-cmake/CMakeLists.txt

@@ -192,16 +192,19 @@ set(SOURCE_FILES
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/fttypes.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/ftparams.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/ftmm.h
+        ../../../src/java.desktop/share/native/libfreetype/include/freetype/config
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/config/ftstdlib.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/config/ftheader.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/config/ftconfig.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/config/ftoption.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/config/ftmodule.h
+        ../../../src/java.desktop/share/native/libfreetype/include/freetype/ftcolor.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/ftmodapi.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/fttrigon.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/ftbbox.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/ftgzip.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/ftdriver.h
+        ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/sfnt.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/internal.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/ftdrv.h
@@ -216,13 +219,13 @@ set(SOURCE_FILES
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/tttypes.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/ftvalid.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/ftobjs.h
-        ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/ftpic.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/fttrace.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/ftmemory.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/fthash.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/ftgloadr.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/ftpsprop.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/ftserv.h
+        ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/services
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svprop.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svmm.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svcfftl.h
@@ -272,6 +275,8 @@ set(SOURCE_FILES
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/ftbdf.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/ftrender.h
         ../../../src/java.desktop/share/native/libfreetype/include/ft2build.h
+        ../../../src/java.desktop/share/native/libfreetype/src
+        ../../../src/java.desktop/share/native/libfreetype/src/type1
         ../../../src/java.desktop/share/native/libfreetype/src/type1/t1objs.c
         ../../../src/java.desktop/share/native/libfreetype/src/type1/t1load.h
         ../../../src/java.desktop/share/native/libfreetype/src/type1/t1afm.h
@@ -286,40 +291,42 @@ set(SOURCE_FILES
         ../../../src/java.desktop/share/native/libfreetype/src/type1/t1driver.c
         ../../../src/java.desktop/share/native/libfreetype/src/type1/t1parse.c
         ../../../src/java.desktop/share/native/libfreetype/src/type1/t1gload.h
+        ../../../src/java.desktop/share/native/libfreetype/src/sfnt
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/sfobjs.c
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttcmap.h
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttpost.h
-        ../../../src/java.desktop/share/native/libfreetype/src/sfnt/sfntpic.h
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttkern.c
+        ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttcolr.h
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/pngshim.h
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttmtx.c
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttload.h
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/sfdriver.c
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttsbit.c
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttcmapc.h
+        ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttcpal.c
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttkern.h
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttpost.c
-        ../../../src/java.desktop/share/native/libfreetype/src/sfnt/sfntpic.c
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/sfobjs.h
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttcmap.c
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttmtx.h
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/pngshim.c
+        ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttcolr.c
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttsbit.h
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/sfdriver.h
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttload.c
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/sferrors.h
+        ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttcpal.h
+        ../../../src/java.desktop/share/native/libfreetype/src/smooth
         ../../../src/java.desktop/share/native/libfreetype/src/smooth/ftgrays.c
         ../../../src/java.desktop/share/native/libfreetype/src/smooth/ftsmooth.h
-        ../../../src/java.desktop/share/native/libfreetype/src/smooth/ftspic.h
         ../../../src/java.desktop/share/native/libfreetype/src/smooth/ftsmerrs.h
         ../../../src/java.desktop/share/native/libfreetype/src/smooth/ftgrays.h
-        ../../../src/java.desktop/share/native/libfreetype/src/smooth/ftspic.c
         ../../../src/java.desktop/share/native/libfreetype/src/smooth/ftsmooth.c
+        ../../../src/java.desktop/share/native/libfreetype/src/cff
         ../../../src/java.desktop/share/native/libfreetype/src/cff/cffload.h
         ../../../src/java.desktop/share/native/libfreetype/src/cff/cffgload.c
         ../../../src/java.desktop/share/native/libfreetype/src/cff/cffobjs.c
         ../../../src/java.desktop/share/native/libfreetype/src/cff/cffparse.h
-        ../../../src/java.desktop/share/native/libfreetype/src/cff/cffpic.h
         ../../../src/java.desktop/share/native/libfreetype/src/cff/cffcmap.h
         ../../../src/java.desktop/share/native/libfreetype/src/cff/cffdrivr.c
         ../../../src/java.desktop/share/native/libfreetype/src/cff/cffparse.c
@@ -327,10 +334,10 @@ set(SOURCE_FILES
         ../../../src/java.desktop/share/native/libfreetype/src/cff/cffobjs.h
         ../../../src/java.desktop/share/native/libfreetype/src/cff/cffgload.h
         ../../../src/java.desktop/share/native/libfreetype/src/cff/cffload.c
-        ../../../src/java.desktop/share/native/libfreetype/src/cff/cffpic.c
         ../../../src/java.desktop/share/native/libfreetype/src/cff/cffdrivr.h
         ../../../src/java.desktop/share/native/libfreetype/src/cff/cffcmap.c
         ../../../src/java.desktop/share/native/libfreetype/src/cff/cfferrs.h
+        ../../../src/java.desktop/share/native/libfreetype/src/psaux
         ../../../src/java.desktop/share/native/libfreetype/src/psaux/psarrst.h
         ../../../src/java.desktop/share/native/libfreetype/src/psaux/psstack.h
         ../../../src/java.desktop/share/native/libfreetype/src/psaux/cffdecode.h
@@ -367,6 +374,7 @@ set(SOURCE_FILES
         ../../../src/java.desktop/share/native/libfreetype/src/psaux/afmparse.c
         ../../../src/java.desktop/share/native/libfreetype/src/psaux/psauxmod.h
         ../../../src/java.desktop/share/native/libfreetype/src/psaux/psread.h
+        ../../../src/java.desktop/share/native/libfreetype/src/cid
         ../../../src/java.desktop/share/native/libfreetype/src/cid/cidtoken.h
         ../../../src/java.desktop/share/native/libfreetype/src/cid/cidriver.c
         ../../../src/java.desktop/share/native/libfreetype/src/cid/cidparse.c
@@ -379,11 +387,12 @@ set(SOURCE_FILES
         ../../../src/java.desktop/share/native/libfreetype/src/cid/cidparse.h
         ../../../src/java.desktop/share/native/libfreetype/src/cid/cidobjs.c
         ../../../src/java.desktop/share/native/libfreetype/src/cid/cidload.h
+        ../../../src/java.desktop/share/native/libfreetype/src/autofit
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afindic.h
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afdummy.h
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afmodule.h
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afwarp.c
-        ../../../src/java.desktop/share/native/libfreetype/src/autofit/afpic.c
+        ../../../src/java.desktop/share/native/libfreetype/src/autofit/afblue.cin
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afglobal.c
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afcover.h
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afwrtsys.h
@@ -396,10 +405,10 @@ set(SOURCE_FILES
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afranges.c
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afcjk.c
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afstyles.h
+        ../../../src/java.desktop/share/native/libfreetype/src/autofit/afblue.dat
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/aferrors.h
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afdummy.c
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afindic.c
-        ../../../src/java.desktop/share/native/libfreetype/src/autofit/afpic.h
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afglobal.h
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afwarp.h
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afmodule.c
@@ -409,64 +418,58 @@ set(SOURCE_FILES
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/aftypes.h
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afcjk.h
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afranges.h
+        ../../../src/java.desktop/share/native/libfreetype/src/autofit/afblue.hin
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afloader.c
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/aflatin.h
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afangles.h
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afhints.c
+        ../../../src/java.desktop/share/native/libfreetype/src/pshinter
         ../../../src/java.desktop/share/native/libfreetype/src/pshinter/pshmod.c
         ../../../src/java.desktop/share/native/libfreetype/src/pshinter/pshrec.h
-        ../../../src/java.desktop/share/native/libfreetype/src/pshinter/pshpic.c
         ../../../src/java.desktop/share/native/libfreetype/src/pshinter/pshglob.h
         ../../../src/java.desktop/share/native/libfreetype/src/pshinter/pshalgo.c
         ../../../src/java.desktop/share/native/libfreetype/src/pshinter/pshmod.h
         ../../../src/java.desktop/share/native/libfreetype/src/pshinter/pshnterr.h
-        ../../../src/java.desktop/share/native/libfreetype/src/pshinter/pshpic.h
         ../../../src/java.desktop/share/native/libfreetype/src/pshinter/pshrec.c
         ../../../src/java.desktop/share/native/libfreetype/src/pshinter/pshalgo.h
         ../../../src/java.desktop/share/native/libfreetype/src/pshinter/pshglob.c
+        ../../../src/java.desktop/share/native/libfreetype/src/truetype
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttinterp.c
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttpload.c
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttgxvar.c
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttsubpix.h
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/tterrors.h
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttdriver.h
-        ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttpic.h
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttobjs.c
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttgload.h
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttgxvar.h
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttpload.h
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttinterp.h
-        ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttpic.c
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttdriver.c
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttsubpix.c
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttobjs.h
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttgload.c
+        ../../../src/java.desktop/share/native/libfreetype/src/raster
         ../../../src/java.desktop/share/native/libfreetype/src/raster/ftmisc.h
         ../../../src/java.desktop/share/native/libfreetype/src/raster/rasterrs.h
-        ../../../src/java.desktop/share/native/libfreetype/src/raster/rastpic.c
         ../../../src/java.desktop/share/native/libfreetype/src/raster/ftrend1.h
         ../../../src/java.desktop/share/native/libfreetype/src/raster/ftraster.h
-        ../../../src/java.desktop/share/native/libfreetype/src/raster/rastpic.h
         ../../../src/java.desktop/share/native/libfreetype/src/raster/ftraster.c
         ../../../src/java.desktop/share/native/libfreetype/src/raster/ftrend1.c
+        ../../../src/java.desktop/share/native/libfreetype/src/psnames
         ../../../src/java.desktop/share/native/libfreetype/src/psnames/psnamerr.h
         ../../../src/java.desktop/share/native/libfreetype/src/psnames/psmodule.c
-        ../../../src/java.desktop/share/native/libfreetype/src/psnames/pspic.h
         ../../../src/java.desktop/share/native/libfreetype/src/psnames/pstables.h
         ../../../src/java.desktop/share/native/libfreetype/src/psnames/psmodule.h
-        ../../../src/java.desktop/share/native/libfreetype/src/psnames/pspic.c
+        ../../../src/java.desktop/share/native/libfreetype/src/base
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftobjs.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftfntfmt.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftinit.c
-        ../../../src/java.desktop/share/native/libfreetype/src/base/ftapi.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftdbgmem.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/fthash.c
-        ../../../src/java.desktop/share/native/libfreetype/src/base/basepic.c
-        ../../../src/java.desktop/share/native/libfreetype/src/base/ftpic.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftbitmap.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftpsprop.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftcid.c
-        ../../../src/java.desktop/share/native/libfreetype/src/base/md5.h
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftglyph.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftgloadr.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftsystem.c
@@ -480,11 +483,9 @@ set(SOURCE_FILES
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftsnames.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftdebug.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftmm.c
-        ../../../src/java.desktop/share/native/libfreetype/src/base/basepic.h
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftbase.h
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftfstype.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/fttrigon.c
-        ../../../src/java.desktop/share/native/libfreetype/src/base/md5.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftbbox.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftstroke.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftgasp.c
@@ -742,38 +743,214 @@ set(SOURCE_FILES
         ../../../src/java.desktop/share/native/libjavajpeg/jidctred.c
         ../../../src/java.desktop/share/native/libjavajpeg/jpegint.h
         ../../../src/java.desktop/share/native/libjavajpeg/jdpostct.c
+        ../../../src/java.desktop/share/native/libfontmanager
         ../../../src/java.desktop/share/native/libfontmanager/DrawGlyphList.c
         ../../../src/java.desktop/share/native/libfontmanager/HBShaper.c
         ../../../src/java.desktop/share/native/libfontmanager/scriptMapping.c
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-fdsc-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-post-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic-machine.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-open-type.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-plan.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-common.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use-machine.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-base-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-head-table.hh
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-coretext.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-win1256.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-khmer.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shaper-list.hh
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-face.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-cff-interp-common.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-map.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-post-macroman.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-fallback.hh
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-common.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-deprecated.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-normalize.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-unicode.cc
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-version.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-stat-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-name-language.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-ltag-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat.h
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-font.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-cff-interp-cs-common.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-kern.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-cff-common.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-default.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-face.cc
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-coretext.h
-        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-tag.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cff1-table.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-just-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color-colr-table.hh
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-deprecated.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-cff1.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-kerx-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-vorg-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-font.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-unicode.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic-table.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-kern-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-normalize.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-common.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-serialize.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-name-language.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gpos-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var-avar-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-cff-common.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-fallback-shape.cc
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cff1-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-face.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-string-array.hh
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-cff1.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-lcar-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var-hvar-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gsubgpos.hh
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-atomic.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-static.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn/ucdn.c
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn/ucdn.h
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn/ucdn_db.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-morx-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-cff2-interp-cs.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-khmer-machine.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-name.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-thai.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-hhea-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var-mvar-table.hh
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-tag.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-plan.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-os2-unicode-ranges.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-warning.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-hdmx-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-khmer.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ft.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cff-common.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gdef-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-glyf-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-fallback.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-map.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-glyf.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-name-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cff2-table.cc
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape-plan.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape-plan.cc
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-font.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color-sbix-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic.hh
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-unicode.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-unicode-emoji-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-feat-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-object.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-myanmar.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-gasp-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-deserialize-json.hh
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-vector.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-myanmar-machine.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-fallback.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-debug.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-tag-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-vowel-constraints.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shaper.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-iter.hh
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-face.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-trak-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-cff1-interp-cs.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-hmtx-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-ankr-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-cff-interp-dict-common.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-map.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-common.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-input.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color-cbdt-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color-cpal-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-cff2.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-utf.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-hebrew.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-map.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var-fvar-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-font.cc
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-map.h
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shaper.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-jstf-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-mutex.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-os2-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-face.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gsub-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-input.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-math-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cmap-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-bsln-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-map.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-font.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-maxp-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-deserialize-text.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-map.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-cff2.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-array.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape-plan.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-hangul.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-null.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cff2-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-name.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-glyf.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set-digest.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-open-file.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-machinery.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-myanmar.cc
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color-svg-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-dsalgs.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use-table.cc
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-math.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-math.cc
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ft.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-vowel-constraints.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shaper-impl.hh
         ../../../src/java.desktop/share/native/libfontmanager/glyphblitting.h
         ../../../src/java.desktop/share/native/libfontmanager/hb-jdk.h
         ../../../src/java.desktop/share/native/libfontmanager/fontconfig.h
+        ../../../src/java.desktop/share/native/libfontmanager/hb-jdk-font.cc
         ../../../src/java.desktop/share/native/libfontmanager/freetypeScaler.c
         ../../../src/java.desktop/share/native/libfontmanager/scriptMapping.h
         ../../../src/java.desktop/share/native/libfontmanager/ColorGlyphSurfaceData.c
@@ -1149,10 +1326,8 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR ${CMAKE_SYSTEM_NAME} MATCHES "Linux"
             ../../../src/java.desktop/unix/native/libawt/awt/awt_Mlib.c
             ../../../src/java.desktop/unix/native/libawt/awt/awt_LoadLibrary.c
             ../../../src/java.desktop/unix/native/libawt/awt/initIDs.c
-            ../../../src/java.desktop/unix/native/libawt_xawt/java2d/x11/XRBackendNative.c
-            ../../../src/java.desktop/unix/native/libawt_xawt/java2d/x11/XRSurfaceData.c
+            ../../../src/java.desktop/unix/native/libawt_xawt/awt
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.c
-            ../../../src/java.desktop/unix/native/libawt_xawt/awt/randr.h
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/list.c
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/awt_DrawingSurface.c
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/swing_GTKStyle.c
@@ -1167,7 +1342,6 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR ${CMAKE_SYSTEM_NAME} MATCHES "Linux"
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/multi_font.c
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/multiVis.h
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/awt_Event.c
-            ../../../src/java.desktop/unix/native/libawt_xawt/awt/Xrandr.h
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/robot_common.c
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/awt_util.c
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/list.h
@@ -1176,7 +1350,6 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR ${CMAKE_SYSTEM_NAME} MATCHES "Linux"
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.c
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/gtk_interface.h
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/awt_Robot.c
-            ../../../src/java.desktop/unix/native/libawt_xawt/awt/HPkeysym.h
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/awt_Event.h
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/multiVis.c
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/canvas.h
@@ -1186,14 +1359,6 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR ${CMAKE_SYSTEM_NAME} MATCHES "Linux"
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/sun_awt_X11_GtkFileDialogPeer.c
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/awt_InputMethod.c
-            ../../../src/java.desktop/unix/native/libawt_xawt/xawt/awt_Desktop.c
-            ../../../src/java.desktop/unix/native/libawt_xawt/xawt/XToolkit.c
-            ../../../src/java.desktop/unix/native/libawt_xawt/xawt/awt_Taskbar.c
-            ../../../src/java.desktop/unix/native/libawt_xawt/xawt/gnome_interface.c
-            ../../../src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c
-            ../../../src/java.desktop/unix/native/libawt_xawt/xawt/gnome_interface.h
-            ../../../src/java.desktop/unix/native/libawt_xawt/xawt/awt_Taskbar.h
-            ../../../src/java.desktop/unix/native/libawt_xawt/xawt/XWindow.c
             ../../../src/java.desktop/unix/native/libfontmanager/X11FontScaler.c
             ../../../src/java.desktop/unix/native/libfontmanager/X11TextRenderer.c
             ../../../src/java.desktop/unix/native/libsplashscreen/splashscreen_config.h

jb/project/tools/mac/scripts/signapp.sh

@@ -37,6 +37,9 @@ BUILD_NAME="$(ls "$EXPLODED")"
 if test -d $EXPLODED/$BUILD_NAME/Contents/Home/jmods; then
   mv $EXPLODED/$BUILD_NAME/Contents/Home/jmods $BACKUP_JMODS
 fi
+if test -d $EXPLODED/$BUILD_NAME/Contents/Home/Frameworks; then
+  mv $EXPLODED/$BUILD_NAME/Contents/Home/Frameworks $BACKUP_JMODS
+fi
 if test -f $EXPLODED/$BUILD_NAME/Contents/MacOS/libjli.dylib; then
   mv $EXPLODED/$BUILD_NAME/Contents/MacOS/libjli.dylib $BACKUP_JMODS
 fi
@@ -131,6 +134,9 @@ log "Zipping $BUILD_NAME to $INPUT_FILE ..."
   if test -d $BACKUP_JMODS/jmods; then
     mv $BACKUP_JMODS/jmods $EXPLODED/$BUILD_NAME/Contents/Home
   fi
+  if test -d $BACKUP_JMODS/Frameworks; then
+    mv $BACKUP_JMODS/Frameworks $EXPLODED/$BUILD_NAME/Contents/Home
+  fi
 
   COPYFILE_DISABLE=1 tar -pczf $INPUT_FILE --exclude='*.dSYM' --exclude='man' -C $EXPLODED $BUILD_NAME
   log "Finished zipping"

make/data/charsetmapping/stdcs-windows

@@ -2,6 +2,7 @@
 #   generate these charsets into sun.nio.cs
 #
 GBK
+GB18030
 Johab
 MS1255
 MS1256

make/data/fontconfig/windows.fontconfig.properties

@@ -42,7 +42,7 @@ allfonts.myanmar=Myanmar Text
 allfonts.dingbats=Wingdings
 allfonts.symbol=Symbol
 allfonts.symbols=Segoe UI Symbol
-allfonts.thai=DokChampa
+allfonts.thai=Tahoma
 allfonts.georgian=Sylfaen
 
 serif.plain.alphabetic=Times New Roman
@@ -50,140 +50,140 @@ serif.plain.chinese-ms950=MingLiU
 serif.plain.chinese-ms950-extb=MingLiU-ExtB
 serif.plain.hebrew=David
 serif.plain.japanese=MS Mincho
-serif.plain.korean=Batang
+serif.plain.korean=Malgun Gothic
 
 serif.bold.alphabetic=Times New Roman Bold
 serif.bold.chinese-ms950=PMingLiU
 serif.bold.chinese-ms950-extb=PMingLiU-ExtB
 serif.bold.hebrew=David Bold
 serif.bold.japanese=MS Mincho
-serif.bold.korean=Batang
+serif.bold.korean=Malgun Gothic
 
 serif.italic.alphabetic=Times New Roman Italic
 serif.italic.chinese-ms950=PMingLiU
 serif.italic.chinese-ms950-extb=PMingLiU-ExtB
 serif.italic.hebrew=David
 serif.italic.japanese=MS Mincho
-serif.italic.korean=Batang
+serif.italic.korean=Malgun Gothic
 
 serif.bolditalic.alphabetic=Times New Roman Bold Italic
 serif.bolditalic.chinese-ms950=PMingLiU
 serif.bolditalic.chinese-ms950-extb=PMingLiU-ExtB
 serif.bolditalic.hebrew=David Bold
 serif.bolditalic.japanese=MS Mincho
-serif.bolditalic.korean=Batang
+serif.bolditalic.korean=Malgun Gothic
 
 sansserif.plain.alphabetic=Arial
 sansserif.plain.chinese-ms950=MingLiU
 sansserif.plain.chinese-ms950-extb=MingLiU-ExtB
 sansserif.plain.hebrew=David
 sansserif.plain.japanese=MS Gothic
-sansserif.plain.korean=Gulim
+sansserif.plain.korean=Malgun Gothic
 
 sansserif.bold.alphabetic=Arial Bold
 sansserif.bold.chinese-ms950=PMingLiU
 sansserif.bold.chinese-ms950-extb=PMingLiU-ExtB
 sansserif.bold.hebrew=David Bold
 sansserif.bold.japanese=MS Gothic
-sansserif.bold.korean=Gulim
+sansserif.bold.korean=Malgun Gothic
 
 sansserif.italic.alphabetic=Arial Italic
 sansserif.italic.chinese-ms950=PMingLiU
 sansserif.italic.chinese-ms950-extb=PMingLiU-ExtB
 sansserif.italic.hebrew=David
 sansserif.italic.japanese=MS Gothic
-sansserif.italic.korean=Gulim
+sansserif.italic.korean=Malgun Gothic
 
 sansserif.bolditalic.alphabetic=Arial Bold Italic
 sansserif.bolditalic.chinese-ms950=PMingLiU
 sansserif.bolditalic.chinese-ms950-extb=PMingLiU-ExtB
 sansserif.bolditalic.hebrew=David Bold
 sansserif.bolditalic.japanese=MS Gothic
-sansserif.bolditalic.korean=Gulim
+sansserif.bolditalic.korean=Malgun Gothic
 
 monospaced.plain.alphabetic=Courier New
 monospaced.plain.chinese-ms950=MingLiU
 monospaced.plain.chinese-ms950-extb=MingLiU-ExtB
 monospaced.plain.hebrew=Courier New
 monospaced.plain.japanese=MS Gothic
-monospaced.plain.korean=GulimChe
+monospaced.plain.korean=Malgun Gothic
 
 monospaced.bold.alphabetic=Courier New Bold
 monospaced.bold.chinese-ms950=PMingLiU
 monospaced.bold.chinese-ms950-extb=PMingLiU-ExtB
 monospaced.bold.hebrew=Courier New Bold
 monospaced.bold.japanese=MS Gothic
-monospaced.bold.korean=GulimChe
+monospaced.bold.korean=Malgun Gothic
 
 monospaced.italic.alphabetic=Courier New Italic
 monospaced.italic.chinese-ms950=PMingLiU
 monospaced.italic.chinese-ms950-extb=PMingLiU-ExtB
 monospaced.italic.hebrew=Courier New
 monospaced.italic.japanese=MS Gothic
-monospaced.italic.korean=GulimChe
+monospaced.italic.korean=Malgun Gothic
 
 monospaced.bolditalic.alphabetic=Courier New Bold Italic
 monospaced.bolditalic.chinese-ms950=PMingLiU
 monospaced.bolditalic.chinese-ms950-extb=PMingLiU-ExtB
 monospaced.bolditalic.hebrew=Courier New Bold
 monospaced.bolditalic.japanese=MS Gothic
-monospaced.bolditalic.korean=GulimChe
+monospaced.bolditalic.korean=Malgun Gothic
 
 dialog.plain.alphabetic=Arial
 dialog.plain.chinese-ms950=MingLiU
 dialog.plain.chinese-ms950-extb=MingLiU-ExtB
 dialog.plain.hebrew=David
 dialog.plain.japanese=MS Gothic
-dialog.plain.korean=Gulim
+dialog.plain.korean=Malgun Gothic
 
 dialog.bold.alphabetic=Arial Bold
 dialog.bold.chinese-ms950=PMingLiU
 dialog.bold.chinese-ms950-extb=PMingLiU-ExtB
 dialog.bold.hebrew=David Bold
 dialog.bold.japanese=MS Gothic
-dialog.bold.korean=Gulim
+dialog.bold.korean=Malgun Gothic
 
 dialog.italic.alphabetic=Arial Italic
 dialog.italic.chinese-ms950=PMingLiU
 dialog.italic.chinese-ms950-extb=PMingLiU-ExtB
 dialog.italic.hebrew=David
 dialog.italic.japanese=MS Gothic
-dialog.italic.korean=Gulim
+dialog.italic.korean=Malgun Gothic
 
 dialog.bolditalic.alphabetic=Arial Bold Italic
 dialog.bolditalic.chinese-ms950=PMingLiU
 dialog.bolditalic.chinese-ms950-extb=PMingLiU-ExtB
 dialog.bolditalic.hebrew=David Bold
 dialog.bolditalic.japanese=MS Gothic
-dialog.bolditalic.korean=Gulim
+dialog.bolditalic.korean=Malgun Gothic
 
 dialoginput.plain.alphabetic=Courier New
 dialoginput.plain.chinese-ms950=MingLiU
 dialoginput.plain.chinese-ms950-extb=MingLiU-ExtB
 dialoginput.plain.hebrew=David
 dialoginput.plain.japanese=MS Gothic
-dialoginput.plain.korean=Gulim
+dialoginput.plain.korean=Malgun Gothic
 
 dialoginput.bold.alphabetic=Courier New Bold
 dialoginput.bold.chinese-ms950=PMingLiU
 dialoginput.bold.chinese-ms950-extb=PMingLiU-ExtB
 dialoginput.bold.hebrew=David Bold
 dialoginput.bold.japanese=MS Gothic
-dialoginput.bold.korean=Gulim
+dialoginput.bold.korean=Malgun Gothic
 
 dialoginput.italic.alphabetic=Courier New Italic
 dialoginput.italic.chinese-ms950=PMingLiU
 dialoginput.italic.chinese-ms950-extb=PMingLiU-ExtB
 dialoginput.italic.hebrew=David
 dialoginput.italic.japanese=MS Gothic
-dialoginput.italic.korean=Gulim
+dialoginput.italic.korean=Malgun Gothic
 
 dialoginput.bolditalic.alphabetic=Courier New Bold Italic
 dialoginput.bolditalic.chinese-ms950=PMingLiU
 dialoginput.bolditalic.chinese-ms950-extb=PMingLiU-ExtB
 dialoginput.bolditalic.hebrew=David Bold
 dialoginput.bolditalic.japanese=MS Gothic
-dialoginput.bolditalic.korean=Gulim
+dialoginput.bolditalic.korean=Malgun Gothic
 
 # Search Sequences
 
@@ -241,7 +241,7 @@ sequence.allfonts.x-windows-874=alphabetic,thai,dingbats,symbol
 sequence.fallback=symbols,\
                   chinese-ms950,chinese-hkscs,chinese-ms936,chinese-gb18030,\
                   japanese,korean,chinese-ms950-extb,chinese-ms936-extb,\
-                  georgian,kannada,myanmar
+                  georgian,kannada,thai,myanmar
 
 # Exclusion Ranges
 
@@ -291,11 +291,8 @@ filename.MS_PMincho=MSMINCHO.TTC
 filename.MS_Gothic=MSGOTHIC.TTC
 filename.MS_PGothic=MSGOTHIC.TTC
 
-filename.Gulim=gulim.TTC
-filename.Batang=batang.TTC
-filename.GulimChe=gulim.TTC
-
-filename.DokChampa=dokchamp.ttf
+filename.Malgun_Gothic=malgun.ttf
+filename.Tahoma=tahoma.ttf
 filename.Mangal=MANGAL.TTF
 filename.Tunga=TUNGA.TTF
 filename.Myanmar_Text=mmrtext.ttf

make/data/x11wrappergen/sizes-32.txt

@@ -272,12 +272,14 @@ XEvent.xclient	0
 XEvent.xcolormap	0
 XEvent.xconfigure	0
 XEvent.xconfigurerequest	0
+XEvent.xcookie	0
 XEvent.xcreatewindow	0
 XEvent.xcrossing	0
 XEvent.xdestroywindow	0
 XEvent.xerror	0
 XEvent.xexpose	0
 XEvent.xfocus	0
+XEvent.xgeneric	0
 XEvent.xgraphicsexpose	0
 XEvent.xgravity	0
 XEvent.xkey	0
@@ -370,6 +372,22 @@ XGCValues.subwindow_mode	64
 XGCValues.tile	44
 XGCValues.ts_x_origin	52
 XGCValues.ts_y_origin	56
+XGenericEvent	24
+XGenericEventCookie	32
+XGenericEventCookie.cookie	24
+XGenericEventCookie.data	28
+XGenericEventCookie.display	12
+XGenericEventCookie.evtype	20
+XGenericEventCookie.extension	16
+XGenericEventCookie.send_event	8
+XGenericEventCookie.serial	4
+XGenericEventCookie.type	0
+XGenericEvent.display	12
+XGenericEvent.evtype	20
+XGenericEvent.extension	16
+XGenericEvent.send_event	8
+XGenericEvent.serial	4
+XGenericEvent.type	0
 XGraphicsExposeEvent	48
 XGraphicsExposeEvent.count	36
 XGraphicsExposeEvent.display	12
@@ -396,6 +414,9 @@ XHostAddress	12
 XHostAddress.address	8
 XHostAddress.family	0
 XHostAddress.length	4
+XIButtonState	8
+XIButtonState.mask	4
+XIButtonState.mask_len	0
 XIconSize	24
 XIconSize.height_inc	20
 XIconSize.max_height	12
@@ -403,6 +424,29 @@ XIconSize.max_width	8
 XIconSize.min_height	4
 XIconSize.min_width	0
 XIconSize.width_inc	16
+XIDeviceEvent	140
+XIDeviceEvent.buttons	88
+XIDeviceEvent.child	48
+XIDeviceEvent.detail	36
+XIDeviceEvent.deviceid	28
+XIDeviceEvent.display	12
+XIDeviceEvent.event	44
+XIDeviceEvent.event_x	68
+XIDeviceEvent.event_y	76
+XIDeviceEvent.evtype	20
+XIDeviceEvent.extension	16
+XIDeviceEvent.flags	84
+XIDeviceEvent.group	124
+XIDeviceEvent.mods	108
+XIDeviceEvent.root	40
+XIDeviceEvent.root_x	52
+XIDeviceEvent.root_y	60
+XIDeviceEvent.send_event	8
+XIDeviceEvent.serial	4
+XIDeviceEvent.sourceid	32
+XIDeviceEvent.time	24
+XIDeviceEvent.type	0
+XIDeviceEvent.valuators	96
 XImage	88
 XImage.bitmap_bit_order	28
 XImage.bitmap_pad	32
@@ -436,6 +480,11 @@ XIMHotKeyTrigger.modifier_mask	8
 XIMHotKeyTriggers	8
 XIMHotKeyTriggers.key	4
 XIMHotKeyTriggers.num_hot_key	0
+XIModifierState	16
+XIModifierState.base	0
+XIModifierState.effective	12
+XIModifierState.latched	4
+XIModifierState.locked	8
 XIMPreeditCaretCallbackStruct	12
 XIMPreeditCaretCallbackStruct.direction	4
 XIMPreeditCaretCallbackStruct.position	0
@@ -472,6 +521,10 @@ XIMText.string	12
 XIMValuesList	8
 XIMValuesList.count_values	0
 XIMValuesList.supported_values	4
+XIValuatorState	12
+XIValuatorState.mask	4
+XIValuatorState.mask_len	0
+XIValuatorState.values	8
 XkbAccessXNotifyEvent	44
 XkbAccessXNotifyEvent.debounce_delay	40
 XkbAccessXNotifyEvent.detail	28

modules.list

@@ -59,4 +59,6 @@ jdk.security.auth,
 jdk.security.jgss,
 jdk.unsupported,
 jdk.xml.dom,
-jdk.zipfs
+jdk.zipfs,
+jdk.hotspot.agent,
+jcef

src/hotspot/share/opto/loopPredicate.cpp

@@ -1132,7 +1132,7 @@ bool PhaseIdealLoop::loop_predication_impl_helper(IdealLoopTree *loop, ProjNode*
     Node*          idx    = cmp->in(1);
     assert(!invar.is_invariant(idx), "index is variant");
     Node* rng = cmp->in(2);
-    assert(rng->Opcode() == Op_LoadRange || iff->is_RangeCheck() || _igvn.type(rng)->is_int()->_lo != 0, "must be");
+    // [tav: crash] assert(rng->Opcode() == Op_LoadRange || iff->is_RangeCheck() || _igvn.type(rng)->is_int()->_lo != 0, "must be");
     assert(invar.is_invariant(rng), "range must be invariant");
     int scale    = 1;
     Node* offset = zero;

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

@@ -70,6 +70,7 @@ import sun.java2d.SurfaceData;
 import sun.java2d.loops.Blit;
 import sun.java2d.loops.CompositeType;
 import sun.java2d.pipe.Region;
+import sun.lwawt.macosx.CPlatformWindow;
 import sun.util.logging.PlatformLogger;
 
 public class LWWindowPeer
@@ -233,7 +234,6 @@ public class LWWindowPeer
 
         setOpaque(getTarget().isOpaque());
 
-        updateInsets(platformWindow.getInsets());
         if (getSurfaceData() == null) {
             replaceSurfaceData(false);
         }
@@ -310,6 +310,7 @@ public class LWWindowPeer
                 }
             }
         }
+        updateInsets(platformWindow.getInsets());
     }
 
     @Override
@@ -1528,4 +1529,17 @@ public class LWWindowPeer
     public String toString() {
         return super.toString() + " [target is " + getTarget() + "]";
     }
+
+    /**
+     * [tav] Used externally.
+     */
+    @Override
+    public long getWindowHandle() {
+        final long[] handle = new long[1];
+        PlatformWindow window = getPlatformWindow();
+        if (window instanceof CPlatformWindow) {
+            ((CPlatformWindow)window).execute(ptr -> handle[0] = ptr);
+        }
+        return handle[0];
+    }
 }

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

@@ -64,11 +64,7 @@ class CFileDialog implements FileDialogPeer {
                 int dialogMode = target.getMode();
                 String title = (target.getTitle() == null) ? "" : target.getTitle();
 
-                Window owner = target.getOwner();
-
-                final Object peer = AWTAccessor.getComponentAccessor().getPeer(owner);
-                Object platformWindow = ((LWWindowPeer) peer).getPlatformWindow();
-                ((CPlatformWindow)platformWindow).execute(ownerPtr -> {
+                final CFRetainedResource.CFNativeAction nativeAction = ownerPtr -> {
                     String[] userFileNames = nativeRunFileDialog(
                             ownerPtr,
                             title,
@@ -106,9 +102,16 @@ class CFileDialog implements FileDialogPeer {
                     accessor.setDirectory(target, directory);
                     accessor.setFile(target, file);
                     accessor.setFiles(target, files);
-                });
-
+                };
 
+                final Window owner = target.getOwner();
+                if (owner == null) {
+                    nativeAction.run(0);
+                } else {
+                    final Object peer = AWTAccessor.getComponentAccessor().getPeer(owner);
+                    Object platformWindow = ((LWWindowPeer) peer).getPlatformWindow();
+                    ((CPlatformWindow)platformWindow).execute(nativeAction);
+                }
             } finally {
                 // Java2 Dialog waits for hide to let show() return
                 target.dispose();

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

@@ -63,6 +63,7 @@ import com.apple.laf.ClientPropertyApplicator.Property;
 import sun.awt.AWTAccessor;
 import sun.awt.AWTAccessor.ComponentAccessor;
 import sun.awt.AWTAccessor.WindowAccessor;
+import sun.awt.InvokeOnToolkitHelper;
 import sun.java2d.SurfaceData;
 import sun.java2d.opengl.CGLSurfaceData;
 import sun.lwawt.LWLightweightFramePeer;
@@ -327,7 +328,7 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
         long nativeWindowPtr = java.security.AccessController.doPrivileged(
                 (PrivilegedAction<Long>) () -> {
                     try {
-                        return LWCToolkit.SelectorPerformer.perform(() -> {
+                        return InvokeOnToolkitHelper.invokeAndBlock(() -> {
                             AtomicLong ref = new AtomicLong();
                             contentView.execute(viewPtr -> {
                                 boolean hasOwnerPtr = false;
@@ -438,81 +439,84 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
 
         if (target instanceof javax.swing.RootPaneContainer) {
             javax.swing.JRootPane rootpane = ((javax.swing.RootPaneContainer)target).getRootPane();
-            Object prop = null;
 
-            prop = rootpane.getClientProperty(WINDOW_BRUSH_METAL_LOOK);
-            if (prop != null) {
-                styleBits = SET(styleBits, TEXTURED, Boolean.parseBoolean(prop.toString()));
-            }
+            if (rootpane != null) {
+                Object prop;
 
-            if (isDialog && ((Dialog)target).getModalityType() == ModalityType.DOCUMENT_MODAL) {
-                prop = rootpane.getClientProperty(WINDOW_DOC_MODAL_SHEET);
+                prop = rootpane.getClientProperty(WINDOW_BRUSH_METAL_LOOK);
                 if (prop != null) {
-                    styleBits = SET(styleBits, SHEET, Boolean.parseBoolean(prop.toString()));
+                    styleBits = SET(styleBits, TEXTURED, Boolean.parseBoolean(prop.toString()));
                 }
-            }
 
-            prop = rootpane.getClientProperty(WINDOW_STYLE);
-            if (prop != null) {
-                if ("small".equals(prop))  {
-                    styleBits = SET(styleBits, UTILITY, true);
-                    if (target.isAlwaysOnTop() && rootpane.getClientProperty(WINDOW_HIDES_ON_DEACTIVATE) == null) {
-                        styleBits = SET(styleBits, HIDES_ON_DEACTIVATE, true);
+                if (isDialog && ((Dialog) target).getModalityType() == ModalityType.DOCUMENT_MODAL) {
+                    prop = rootpane.getClientProperty(WINDOW_DOC_MODAL_SHEET);
+                    if (prop != null) {
+                        styleBits = SET(styleBits, SHEET, Boolean.parseBoolean(prop.toString()));
                     }
                 }
-                if ("textured".equals(prop)) styleBits = SET(styleBits, TEXTURED, true);
-                if ("unified".equals(prop)) styleBits = SET(styleBits, UNIFIED, true);
-                if ("hud".equals(prop)) styleBits = SET(styleBits, HUD, true);
-            }
 
-            prop = rootpane.getClientProperty(WINDOW_HIDES_ON_DEACTIVATE);
-            if (prop != null) {
-                styleBits = SET(styleBits, HIDES_ON_DEACTIVATE, Boolean.parseBoolean(prop.toString()));
-            }
+                prop = rootpane.getClientProperty(WINDOW_STYLE);
+                if (prop != null) {
+                    if ("small".equals(prop)) {
+                        styleBits = SET(styleBits, UTILITY, true);
+                        if (target.isAlwaysOnTop() && rootpane.getClientProperty(WINDOW_HIDES_ON_DEACTIVATE) == null) {
+                            styleBits = SET(styleBits, HIDES_ON_DEACTIVATE, true);
+                        }
+                    }
+                    if ("textured".equals(prop)) styleBits = SET(styleBits, TEXTURED, true);
+                    if ("unified".equals(prop)) styleBits = SET(styleBits, UNIFIED, true);
+                    if ("hud".equals(prop)) styleBits = SET(styleBits, HUD, true);
+                }
 
-            prop = rootpane.getClientProperty(WINDOW_CLOSEABLE);
-            if (prop != null) {
-                styleBits = SET(styleBits, CLOSEABLE, Boolean.parseBoolean(prop.toString()));
-            }
+                prop = rootpane.getClientProperty(WINDOW_HIDES_ON_DEACTIVATE);
+                if (prop != null) {
+                    styleBits = SET(styleBits, HIDES_ON_DEACTIVATE, Boolean.parseBoolean(prop.toString()));
+                }
 
-            prop = rootpane.getClientProperty(WINDOW_MINIMIZABLE);
-            if (prop != null) {
-                styleBits = SET(styleBits, MINIMIZABLE, Boolean.parseBoolean(prop.toString()));
-            }
+                prop = rootpane.getClientProperty(WINDOW_CLOSEABLE);
+                if (prop != null) {
+                    styleBits = SET(styleBits, CLOSEABLE, Boolean.parseBoolean(prop.toString()));
+                }
 
-            prop = rootpane.getClientProperty(WINDOW_DARK_APPEARANCE);
-            if (prop != null) {
-                styleBits = SET(styleBits, DARK, Boolean.parseBoolean(prop.toString()));
-            }
+                prop = rootpane.getClientProperty(WINDOW_MINIMIZABLE);
+                if (prop != null) {
+                    styleBits = SET(styleBits, MINIMIZABLE, Boolean.parseBoolean(prop.toString()));
+                }
 
-            prop = rootpane.getClientProperty(WINDOW_TRANSPARENT_TITLEBAR_APPEARANCE);
-            if (prop != null) {
-                styleBits = SET(styleBits, TRANSPARENT_TITLEBAR, Boolean.parseBoolean(prop.toString()));
-            }
+                prop = rootpane.getClientProperty(WINDOW_DARK_APPEARANCE);
+                if (prop != null) {
+                    styleBits = SET(styleBits, DARK, Boolean.parseBoolean(prop.toString()));
+                }
 
-            prop = rootpane.getClientProperty(WINDOW_LIGHT_APPEARANCE);
-            if (prop != null) {
-                styleBits = SET(styleBits, LIGHT, Boolean.parseBoolean(prop.toString()));
-            }
+                prop = rootpane.getClientProperty(WINDOW_TRANSPARENT_TITLEBAR_APPEARANCE);
+                if (prop != null) {
+                    styleBits = SET(styleBits, TRANSPARENT_TITLEBAR, Boolean.parseBoolean(prop.toString()));
+                }
 
-            prop = rootpane.getClientProperty(WINDOW_ZOOMABLE);
-            if (prop != null) {
-                styleBits = SET(styleBits, ZOOMABLE, Boolean.parseBoolean(prop.toString()));
-            }
+                prop = rootpane.getClientProperty(WINDOW_LIGHT_APPEARANCE);
+                if (prop != null) {
+                    styleBits = SET(styleBits, LIGHT, Boolean.parseBoolean(prop.toString()));
+                }
 
-            prop = rootpane.getClientProperty(WINDOW_FULLSCREENABLE);
-            if (prop != null) {
-                styleBits = SET(styleBits, FULLSCREENABLE, Boolean.parseBoolean(prop.toString()));
-            }
+                prop = rootpane.getClientProperty(WINDOW_ZOOMABLE);
+                if (prop != null) {
+                    styleBits = SET(styleBits, ZOOMABLE, Boolean.parseBoolean(prop.toString()));
+                }
 
-            prop = rootpane.getClientProperty(WINDOW_SHADOW);
-            if (prop != null) {
-                styleBits = SET(styleBits, HAS_SHADOW, Boolean.parseBoolean(prop.toString()));
-            }
+                prop = rootpane.getClientProperty(WINDOW_FULLSCREENABLE);
+                if (prop != null) {
+                    styleBits = SET(styleBits, FULLSCREENABLE, Boolean.parseBoolean(prop.toString()));
+                }
 
-            prop = rootpane.getClientProperty(WINDOW_DRAGGABLE_BACKGROUND);
-            if (prop != null) {
-                styleBits = SET(styleBits, DRAGGABLE_BACKGROUND, Boolean.parseBoolean(prop.toString()));
+                prop = rootpane.getClientProperty(WINDOW_SHADOW);
+                if (prop != null) {
+                    styleBits = SET(styleBits, HAS_SHADOW, Boolean.parseBoolean(prop.toString()));
+                }
+
+                prop = rootpane.getClientProperty(WINDOW_DRAGGABLE_BACKGROUND);
+                if (prop != null) {
+                    styleBits = SET(styleBits, DRAGGABLE_BACKGROUND, Boolean.parseBoolean(prop.toString()));
+                }
             }
         }
 

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

@@ -87,15 +87,10 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.UndeclaredThrowableException;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.net.MalformedURLException;
-import java.security.*;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
-import java.util.*;
-import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.Callable;
 import java.util.HashMap;
 import java.util.Locale;
@@ -106,12 +101,7 @@ import java.util.ResourceBundle;
 import javax.swing.UIManager;
 
 import com.apple.laf.AquaMenuBarUI;
-import sun.awt.AWTAccessor;
-import sun.awt.AppContext;
-import sun.awt.CGraphicsConfig;
-import sun.awt.CGraphicsDevice;
-import sun.awt.LightweightFrame;
-import sun.awt.SunToolkit;
+import sun.awt.*;
 import sun.awt.datatransfer.DataTransferer;
 import sun.awt.util.ThreadGroupUtils;
 import sun.java2d.opengl.OGLRenderQueue;
@@ -482,7 +472,7 @@ public final class LWCToolkit extends LWToolkit {
     public Insets getScreenInsets(final GraphicsConfiguration gc) {
         CGraphicsDevice gd = ((CGraphicsConfig) gc).getDevice();
         // Avoid deadlock with input methods
-        return LWCToolkit.SelectorPerformer.perform(gd::getScreenInsets);
+        return InvokeOnToolkitHelper.invokeAndBlock(gd::getScreenInsets);
     }
 
     @Override
@@ -700,150 +690,6 @@ public final class LWCToolkit extends LWToolkit {
         }
     }
 
-    /**
-     * Performs a wrapped native selector on the main thread, waiting on EDT, preventing the threads from a deadlock.
-     */
-    public static class SelectorPerformer {
-        private ExecutorService executor;
-        // every perform() pushes a queue of invocations
-        private Stack<LinkedBlockingQueue<InvocationEvent>> invocations = new Stack<>();
-
-        // invocations should be dispatched on proper EDT (per AppContext)
-        private static final Map<Thread, SelectorPerformer> edt2performer = new ConcurrentHashMap<>();
-
-        private static final int WAIT_LIMIT_SECONDS = 5;
-
-        private SelectorPerformer() {}
-
-        /**
-         * Performs the selector wrapped in the callable. The selector should be executed via [JNFRunLoop performOnMainThreadWaiting:YES ...]
-         * on the native side so that the native doAWTRunLoop, which is run in [JNFRunLoop javaRunLoopMode], accepts it.
-         * The callable wrapper should not call any Java code which would normally be called on EDT.
-         * <p>
-         * If the main thread posts invocation events caused by the selector, those events are intercepted and dispatched on EDT out of order.
-         * <p>
-         * When called on non-EDT, the method performs the selector in place. The method is reentrant.
-         *
-         * @param selector the native selector wrapper
-         * @param <T> the selector return type
-         * @return the selector result
-         */
-        public static <T> T perform(Callable<T> selector) {
-            if (selector == null) return null;
-
-            if (EventQueue.isDispatchThread()) {
-                SelectorPerformer performer = getInstance(Thread.currentThread());
-                if (performer != null) {
-                    return performer.performImpl(selector);
-                }
-            }
-            // fallback to default
-            try {
-                return selector.call();
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-            return null;
-        }
-
-        private <T> T performImpl(Callable<T> selector) {
-            assert EventQueue.isDispatchThread();
-            if (executor == null) {
-                // init on EDT
-                AccessController.doPrivileged((PrivilegedAction<?>)() ->
-                    executor = new ThreadPoolExecutor(1, Integer.MAX_VALUE,
-                            60L, TimeUnit.SECONDS,
-                            new SynchronousQueue<>(),
-                            new ThreadFactory() {
-                                private ThreadFactory factory = Executors.privilegedThreadFactory();
-                                @Override
-                                public Thread newThread(Runnable r) {
-                                    Thread t = factory.newThread(r);
-                                    t.setDaemon(true);
-                                    t.setName("AWT-SelectorPerformer " + t.getName());
-                                    return t;
-                                }
-                            })
-                );
-            }
-            LinkedBlockingQueue<InvocationEvent> currentQueue;
-            synchronized (invocations) {
-                invocations.push(currentQueue = new LinkedBlockingQueue<>());
-            }
-
-            FutureTask<T> task = new FutureTask<T>(selector) {
-                @Override
-                protected void done() {
-                    synchronized (invocations) {
-                        // Done with the current queue, wake it up.
-                        invocations.pop().add(new InvocationEvent(executor, () -> {}));
-                    }
-                }
-            };
-            executor.execute(task);
-
-            try {
-                while (!task.isDone() || !currentQueue.isEmpty()) {
-                    InvocationEvent event = currentQueue.poll(WAIT_LIMIT_SECONDS, TimeUnit.SECONDS);
-                    if (event == null) {
-                        new RuntimeException("Waiting for the invocation event timed out").printStackTrace();
-                        break;
-                    }
-                    event.dispatch();
-                }
-                return task.isDone() ? task.get() : null;
-
-            } catch (InterruptedException | ExecutionException e) {
-                e.printStackTrace();
-            }
-            return null;
-        }
-
-        /**
-         * Checks if there's an active SelectorPerformer corresponding to the invocation's AppContext,
-         * adds the invocation to the SelectorPerformer's queue and returns true.
-         * Otherwise does nothing and returns false.
-         */
-        public static boolean offer(InvocationEvent invocation) {
-            Object source = invocation.getSource();
-
-            SelectorPerformer performer = (source instanceof Component) ?
-                    getInstance((Component)source) :
-                    getInstance(Toolkit.getDefaultToolkit().getSystemEventQueue());
-
-            if (performer == null) return false;
-
-            synchronized (performer.invocations) {
-                if (!performer.invocations.isEmpty()) {
-                    performer.invocations.peek().add(invocation);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        private static SelectorPerformer getInstance(Component comp) {
-            if (comp == null) return null;
-
-            AppContext appContext = SunToolkit.targetToAppContext(comp);
-            if (appContext == null) return null;
-
-            return getInstance((EventQueue)appContext.get(AppContext.EVENT_QUEUE_KEY));
-        }
-
-        private static SelectorPerformer getInstance(EventQueue eq) {
-            if (eq == null) return null;
-
-            return getInstance(AWTAccessor.getEventQueueAccessor().getDispatchThread(eq));
-        }
-
-        private static SelectorPerformer getInstance(Thread edt) {
-            if (edt == null) return null;
-
-            return edt2performer.computeIfAbsent(edt, key -> new SelectorPerformer());
-        }
-    }
-
     /**
      * Kicks an event over to the appropriate event queue and waits for it to
      * finish To avoid deadlocking, we manually run the NSRunLoop while waiting
@@ -889,7 +735,7 @@ public final class LWCToolkit extends LWToolkit {
                         },
                         true);
 
-        if (!SelectorPerformer.offer(invocationEvent)) {
+        if (!InvokeOnToolkitHelper.offer(invocationEvent)) {
             if (component != null) {
                 AppContext appContext = SunToolkit.targetToAppContext(component);
                 SunToolkit.postEvent(appContext, invocationEvent);

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

@@ -165,7 +165,9 @@ canChooseDirectories:(BOOL)inChooseDirectories
                 [CMenuBar activate:menuBar modallyDisabled:isDisabled];
             }
 
-            [thePanel setAppearance:fOwner.appearance];
+            if (@available(macOS 10.14, *)) {
+                [thePanel setAppearance:fOwner.appearance];
+            }
 
             void (^onComplete)(BOOL, BOOL) = ^(BOOL responseOK, BOOL doStopModal) {
                 if (responseOK) {

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

@@ -210,6 +210,7 @@ static NSObject *sAttributeNamesLOCK = nil;
 {
     AWT_ASSERT_APPKIT_THREAD;
     NSAccessibilityPostNotification(self, NSAccessibilitySelectedChildrenChangedNotification);
+//    NSAccessibilityPostNotification(self, NSAccessibilityFocusedUIElementChangedNotification);
 }
 
 - (void)postMenuOpened
@@ -744,6 +745,11 @@ static NSObject *sAttributeNamesLOCK = nil;
     return value;
 }
 
+- (NSArray *)accessibilityChildren
+{
+    return [self accessibilityChildrenAttribute];
+}
+
 - (BOOL)accessibilityIsChildrenAttributeSettable
 {
     return NO;
@@ -1353,12 +1359,12 @@ static NSObject *sAttributeNamesLOCK = nil;
     jobject focused = JNFCallStaticObjectMethod(env, jm_getFocusOwner, fComponent); // AWT_THREADING Safe (AWTRunLoop)
     [hostWindow release];
 
-    if (focused != NULL) {
-        if (JNFIsInstanceOf(env, focused, &sjc_Accessible)) {
-            value = [JavaComponentAccessibility createWithAccessible:focused withEnv:env withView:fView];
-        }
-        (*env)->DeleteLocalRef(env, focused);
-    }
+//    if (focused != NULL) {
+//        if (JNFIsInstanceOf(env, focused, &sjc_Accessible)) {
+//            value = [JavaComponentAccessibility createWithAccessible:focused withEnv:env withView:fView];
+//        }
+//        (*env)->DeleteLocalRef(env, focused);
+//    }
 
     if (value == nil) {
         value = self;
@@ -1369,6 +1375,10 @@ static NSObject *sAttributeNamesLOCK = nil;
     return value;
 }
 
+- (NSArray *)accessibilitySelectedChildren {
+    return [self accessibilitySelectedChildrenAttribute];
+}
+
 @end
 
 /*

src/java.desktop/macosx/native/libawt_lwawt/awt/LWCToolkit.h

@@ -40,6 +40,8 @@ extern int gNumberOfButtons;
 // InputEvent mask array
 extern jint* gButtonDownMasks;
 
+extern int lcdSubPixelPosSupported;
+
 @interface AWTToolkit : NSObject { }
 + (long) getEventCount;
 + (void) eventCountPlusPlus;

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

@@ -52,6 +52,7 @@
 
 int gNumberOfButtons;
 jint* gButtonDownMasks;
+int lcdSubPixelPosSupported;
 
 // Indicates that the app has been started with -XstartOnFirstThread
 // (directly or via WebStart settings), and AWT should not run its

src/java.desktop/macosx/native/libawt_lwawt/font/AWTStrike.m

@@ -163,7 +163,7 @@ JNF_COCOA_ENTER(env);
     const CTFontRef fallback = CTS_CopyCTFallbackFontAndGlyphForJavaGlyphCode(awtFont, glyphCode, &glyph);
     const CGFontRef cgFallback = CTFontCopyGraphicsFont(fallback, NULL);
     if (IS_OSX_GT10_14 || CGGI_IsColorFont(cgFallback)) {
-        CGAffineTransform matrix = CGAffineTransformConcat(awtStrike->fAltTx, awtStrike->fFontTx);
+        CGAffineTransform matrix = awtStrike->fAltTx;
         CGFloat fontSize = sqrt(fabs(matrix.a * matrix.d - matrix.b * matrix.c));
         CTFontRef font = CTFontCreateWithGraphicsFont(cgFallback, fontSize, NULL, NULL);
         CTFontGetAdvancesForGlyphs(font, kCTFontDefaultOrientation, &glyph, &advance, 1);

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

@@ -337,7 +337,7 @@ Java_sun_java2d_opengl_CGLGraphicsConfig_getCGLConfigInfo
             CFPreferencesGetAppBooleanValue(
             CFSTR("CGFontRenderingFontSmoothingDisabled"),
             kCFPreferencesCurrentApplication, &status);
-
+    lcdSubPixelPosSupported = YES;
     if (status) {
         if (fontSmoothingDisabled) {
             J2dRlsTraceLn(J2D_TRACE_INFO,
@@ -355,7 +355,7 @@ Java_sun_java2d_opengl_CGLGraphicsConfig_getCGLConfigInfo
         if (!status) {
             smoothFonts = YES;
         }
-
+        lcdSubPixelPosSupported = !smoothFonts;
         if (!smoothFonts) {
             J2dRlsTraceLn(J2D_TRACE_INFO,
                     "LCD_SHADER: disabled on macOS 10.14+ by default");

src/java.desktop/macosx/native/libosxapp/NSApplicationAWT.m

@@ -50,7 +50,7 @@ BOOL postEventDuringEventSynthesis = NO;
  * Subtypes of NSApplicationDefined, which are used for custom events.
  */
 enum {
-    ExecuteBlockEvent, NativeSyncQueueEvent
+    ExecuteBlockEvent = 777, NativeSyncQueueEvent
 };
 
 @implementation NSApplicationAWT
@@ -366,11 +366,15 @@ untilDate:(NSDate *)expiration inMode:(NSString *)mode dequeue:(BOOL)deqFlag {
 {
     if ([event type] == NSApplicationDefined
             && TS_EQUAL([event timestamp], dummyEventTimestamp)
-            && [event subtype] == NativeSyncQueueEvent) {
+            && (short)[event subtype] == NativeSyncQueueEvent
+            && [event data1] == NativeSyncQueueEvent
+            && [event data2] == NativeSyncQueueEvent) {
         [seenDummyEventLock lockWhenCondition:NO];
         [seenDummyEventLock unlockWithCondition:YES];
 
-    } else if ([event type] == NSApplicationDefined && [event subtype] == ExecuteBlockEvent) {
+    } else if ([event type] == NSApplicationDefined
+               && (short)[event subtype] == ExecuteBlockEvent
+               && [event data1] != 0 && [event data2] == ExecuteBlockEvent) {
         void (^block)() = (void (^)()) [event data1];
         block();
         [block release];
@@ -401,7 +405,7 @@ untilDate:(NSDate *)expiration inMode:(NSString *)mode dequeue:(BOOL)deqFlag {
                                          context: nil
                                          subtype: ExecuteBlockEvent
                                            data1: encode
-                                           data2: 0];
+                                           data2: ExecuteBlockEvent];
 
     [NSApp postEvent: event atStart: NO];
     [pool drain];
@@ -419,8 +423,8 @@ untilDate:(NSDate *)expiration inMode:(NSString *)mode dequeue:(BOOL)deqFlag {
                                     windowNumber: 0
                                          context: nil
                                          subtype: NativeSyncQueueEvent
-                                           data1: 0
-                                           data2: 0];
+                                           data1: NativeSyncQueueEvent
+                                           data2: NativeSyncQueueEvent];
     if (useCocoa) {
         [NSApp postEvent:event atStart:NO];
     } else {

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

@@ -7214,6 +7214,13 @@ public abstract class Component implements ImageObserver, MenuContainer,
                                         : 0));
                 dispatchEvent(e);
             }
+
+            Window window = getContainingWindow();
+            // window is supposed to be not a null value (addNotify)
+            Component mostRecentFocusOwner = KeyboardFocusManager.getMostRecentFocusOwner(window);
+            if (mostRecentFocusOwner != this) {
+                requestFocusInWindow();
+            }
         }
     }
 

src/java.desktop/share/classes/java/awt/peer/WindowPeer.java

@@ -125,4 +125,11 @@ public interface WindowPeer extends ContainerPeer {
      * @return the system insets or null
      */
     default Insets getSysInsets() { return null; }
+
+    /**
+     * Returns platform window handle.
+     */
+    default long getWindowHandle() {
+        throw new UnsupportedOperationException();
+    }
 }

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

@@ -200,6 +200,7 @@ public class JMenuBar extends JComponent implements Accessible,MenuElement
      */
     public JMenu add(JMenu c) {
         super.add(c);
+        c.setFocusable(false);
         return c;
     }
 

src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java

@@ -1480,13 +1480,9 @@ public class StyleSheet extends StyleContext {
             }
             // Get the AttributeSet from linked style sheets.
             for (int counter = 0; counter < numLinkedSS; counter++) {
-                AttributeSet attr = linkedStyleSheets.elementAt(counter).getRule(selector);
-                if (attr == null) {
-                    attrs[counter + numStyles] = SimpleAttributeSet.EMPTY;
-                }
-                else {
-                    attrs[counter + numStyles] = attr;
-                }
+                StyleSheet styleSheet = linkedStyleSheets.elementAt(counter);
+                attrs[counter + numStyles] =
+                        (styleSheet == null) ? SimpleAttributeSet.EMPTY : styleSheet.getRule(selector);
             }
             ResolvedStyle retStyle = new ResolvedStyle(selector, attrs,
                                                        numStyles);

src/java.desktop/share/classes/module-info.java

@@ -109,7 +109,10 @@ module java.desktop {
     // see make/GensrcModuleInfo.gmk
     exports sun.awt to
         jdk.accessibility,
-        jdk.unsupported.desktop;
+        jdk.unsupported.desktop,
+        jcef;
+
+    exports java.awt.peer to jcef;
 
     exports java.awt.dnd.peer to jdk.unsupported.desktop;
     exports sun.awt.dnd to jdk.unsupported.desktop;

src/java.desktop/share/classes/sun/awt/InvokeOnToolkitHelper.java

@@ -0,0 +1,157 @@
+package sun.awt;
+
+import java.awt.*;
+import java.awt.event.InvocationEvent;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.Map;
+import java.util.Stack;
+import java.util.concurrent.*;
+
+/**
+ * Used to perform a blocking invocation on Toolkit thread from EDT, preventing a deadlock.
+ * The deadlock can happen when EDT and Toolkit perform blocking invocations at the same time.
+ * The following is performed to resolve it:
+ * 1) The invoker spins a nested event loop on EDT while waiting for the invocation to complete.
+ * 2) A separate pool thread is used to perform the invocation.
+ */
+public class InvokeOnToolkitHelper {
+    private ExecutorService executor;
+    // every invokeAndWait() pushes a queue of invocations
+    private final Stack<LinkedBlockingQueue<InvocationEvent>> invocations = new Stack<>();
+
+    // invocations should be dispatched on proper EDT (per AppContext)
+    private static final Map<Thread, InvokeOnToolkitHelper> edt2invokerMap = new ConcurrentHashMap<>();
+
+    private static final int WAIT_LIMIT_SECONDS = 5;
+
+    private InvokeOnToolkitHelper() {}
+
+    /**
+     * Invokes the callable on Toolkit thread and blocks until the completion. The method is re-entrant.
+     *
+     * On macOS it is assumed the callable wraps a native selector. The selector should be executed via [JNFRunLoop performOnMainThreadWaiting:YES ...]
+     * so that the doAWTRunLoop on AppKit (which is run in [JNFRunLoop javaRunLoopMode]) accepts it. The callable wrapper should not call any Java code
+     * which would normally be called on EDT.
+     * <p>
+     * If Toolkit posts invocation events caused by the callable, those events are intercepted and dispatched on EDT out of order.
+     * <p>
+     * When called on non-EDT, the method invokes the callable in place.
+     */
+    public static <T> T invokeAndBlock(Callable<T> callable) {
+        if (callable == null) return null;
+
+        if (EventQueue.isDispatchThread()) {
+            InvokeOnToolkitHelper invoker = getInstance(Thread.currentThread());
+            if (invoker != null) {
+                return invoker.invoke(callable);
+            }
+        }
+        // fallback to default
+        try {
+            return callable.call();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    private <T> T invoke(Callable<T> callable) {
+        assert EventQueue.isDispatchThread();
+        if (executor == null) {
+            // init on EDT
+            AccessController.doPrivileged((PrivilegedAction<?>)() ->
+                    executor = new ThreadPoolExecutor(1, Integer.MAX_VALUE,
+                            60L, TimeUnit.SECONDS,
+                            new SynchronousQueue<>(),
+                            new ThreadFactory() {
+                                private final ThreadFactory factory = Executors.privilegedThreadFactory();
+                                @Override
+                                public Thread newThread(Runnable r) {
+                                    Thread t = factory.newThread(r);
+                                    t.setDaemon(true);
+                                    t.setName("AWT-InvokeOnToolkitHelper " + t.getName());
+                                    return t;
+                                }
+                            })
+            );
+        }
+        LinkedBlockingQueue<InvocationEvent> currentQueue;
+        synchronized (invocations) {
+            invocations.push(currentQueue = new LinkedBlockingQueue<>());
+        }
+
+        FutureTask<T> task = new FutureTask<T>(callable) {
+            @Override
+            protected void done() {
+                synchronized (invocations) {
+                    // Done with the current queue, wake it up.
+                    invocations.pop().add(new InvocationEvent(executor, () -> {}));
+                }
+            }
+        };
+        executor.execute(task);
+
+        try {
+            while (!task.isDone() || !currentQueue.isEmpty()) {
+                InvocationEvent event = currentQueue.poll(WAIT_LIMIT_SECONDS, TimeUnit.SECONDS);
+                if (event == null) {
+                    new RuntimeException("Waiting for the invocation event timed out").printStackTrace();
+                    break;
+                }
+                event.dispatch();
+            }
+            return task.isDone() ? task.get() : null;
+
+        } catch (InterruptedException | ExecutionException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * Warning: the method is used by the implementation and should not be used by a client.
+     *
+     * Checks if there's an active InvokeOnToolkitHelper corresponding to the invocation's AppContext,
+     * adds the invocation to the InvokeOnToolkitHelper's queue and returns true.
+     * Otherwise does nothing and returns false.
+     */
+    public static boolean offer(InvocationEvent invocation) {
+        Object source = invocation.getSource();
+
+        InvokeOnToolkitHelper invoker = (source instanceof Component) ?
+                getInstance((Component)source) :
+                getInstance(Toolkit.getDefaultToolkit().getSystemEventQueue());
+
+        if (invoker == null) return false;
+
+        synchronized (invoker.invocations) {
+            if (!invoker.invocations.isEmpty()) {
+                invoker.invocations.peek().add(invocation);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private static InvokeOnToolkitHelper getInstance(Component comp) {
+        if (comp == null) return null;
+
+        AppContext appContext = SunToolkit.targetToAppContext(comp);
+        if (appContext == null) return null;
+
+        return getInstance((EventQueue)appContext.get(AppContext.EVENT_QUEUE_KEY));
+    }
+
+    private static InvokeOnToolkitHelper getInstance(EventQueue eq) {
+        if (eq == null) return null;
+
+        return getInstance(AWTAccessor.getEventQueueAccessor().getDispatchThread(eq));
+    }
+
+    private static InvokeOnToolkitHelper getInstance(Thread edt) {
+        if (edt == null) return null;
+
+        return edt2invokerMap.computeIfAbsent(edt, key -> new InvokeOnToolkitHelper());
+    }
+}

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

@@ -51,17 +51,30 @@ class FreetypeFontScaler extends FontScaler {
            and therefore no need to load it explicitly here */
         FontManagerNativeLibrary.load();
 
-        String jreFontConfName = java.security.AccessController.doPrivileged(
-                (PrivilegedAction<String>) () ->
-                        "true".equals(System.getProperty(
-                                "java2d.font.loadFontConf", "")) ?
-                                System.getProperty("java.home", "") +
-                                File.separator + "lib" + File.separator +
-                                "fonts" + File.separator + "font.conf" :
-                                null);
+        String fontConfName = java.security.AccessController.doPrivileged(
+                (PrivilegedAction<String>) () -> {
+                    String loadFontConfig = System.getProperty(
+                            "java2d.font.loadFontConf", "");
+                    if ("true".equals(loadFontConfig)) {
+                        File f = new File(System.getProperty("user.home", "") +
+                                File.separator + ".fonts.conf");
+
+                        if (f.exists()) {
+                            return f.getAbsolutePath();
+                        }
+                    }
+
+                    if ("true".equals(loadFontConfig) || "bundled".equals(loadFontConfig)) {
+                        File f = new File(System.getProperty("java.home", "") +
+                                File.separator + "lib" + File.separator + "fonts" + File.separator + "font.conf");
+
+                        return f.getAbsolutePath();
+                    }
+                    return null;
+                });
 
         initIDs(FreetypeFontScaler.class, Toolkit.class, PhysicalFont.class,
-                jreFontConfName);
+                fontConfName);
     }
 
     private static native void initIDs(Class<?> FFS, Class<?> toolkitClass, Class<?> pfClass,

src/java.desktop/share/classes/sun/swing/SwingUtilities2.java

@@ -1252,8 +1252,7 @@ public class SwingUtilities2 {
 
             GraphicsConfiguration gc = c.getGraphicsConfiguration();
             AffineTransform tx = (gc == null) ? null : gc.getDefaultTransform();
-            // [tav] workaround deadlock on MacOSX until fixed, JRE-226
-            if (!FontUtilities.isMacOSX && tx == null && !GraphicsEnvironment.isHeadless()) {
+            if (tx == null && !GraphicsEnvironment.isHeadless()) {
                 tx =  GraphicsEnvironment
                         .getLocalGraphicsEnvironment()
                         .getDefaultScreenDevice()

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

@@ -1027,6 +1027,10 @@ OGLTR_DrawColorGlyphNoCache(OGLContext *oglc, GlyphInfo *ginfo, jint x, jint y)
     return JNI_TRUE;
 }
 
+// Control subpixel positioning for macOS 13+ grayscale glyphs
+#ifdef MACOSX
+extern int lcdSubPixelPosSupported;
+#endif
 
 // see DrawGlyphList.c for more on this macro...
 #define FLOOR_ASSIGN(l, r) \
@@ -1079,6 +1083,8 @@ OGLTR_DrawGlyphList(JNIEnv *env, OGLContext *oglc, OGLSDOps *dstOps,
     {
         dstTextureID = dstOps->textureID;
     }
+
+    subPixPos = lcdSubPixelPosSupported ? subPixPos : 0;
 #endif
 
     for (glyphCounter = 0; glyphCounter < totalGlyphs; glyphCounter++) {

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

@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #include <math.h>
 
-#if !defined(_WIN32) && !defined(__APPLE_)
+#if !defined(_WIN32) && !defined(__APPLE__)
 #include <dlfcn.h>
 #else
 #define DISABLE_FONTCONFIG
@@ -260,7 +260,7 @@ Java_sun_font_FreetypeFontScaler_initIDs(
         fcConfig = (*FcInitLoadConfigAndFontsPtr)();
         if (fcConfig != NULL && fontConf != NULL) {
             result = (*FcConfigParseAndLoadPtr)(fcConfig, (const FcChar8 *) fontConf, FcFalse);
-            if (logFC) fprintf(stderr, "FC_LOG: FcConfigParseAndLoad %d \n", result);
+            if (logFC) fprintf(stderr, "FC_LOG: FcConfigParseAndLoad(\"%s\") %d \n", fontConf,  result);
             result = (*FcConfigSetCurrentPtr)(fcConfig);
             if (logFC) fprintf(stderr, "FC_LOG: FcConfigSetCurrent %d \n", result);
         }
@@ -736,7 +736,7 @@ static void setupLoadRenderFlags(FTScalerContext *context, int fcHintStyle, FcBo
             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;
+            context->loadFlags = FT_LOAD_TARGET_LIGHT;
             break;
         default:
             context->loadFlags = fcLoadFlags;

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

@@ -60,7 +60,7 @@ class XWindow extends XBaseWindow implements X11ComponentPeer {
     private static int touchBeginX = 0, touchBeginY = 0;
     private static int trackingId = 0;
     private static boolean isTouchScroll = false;
-    private static final int TOUCH_CLICK_RADIUS = 3;
+    private static final int TOUCH_CLICK_RADIUS = 10;
     // all touch scrolls are measured in pixels
     private static final int TOUCH_BEGIN = 2;
     private static final int TOUCH_UPDATE = 3;
@@ -813,16 +813,13 @@ class XWindow extends XBaseWindow implements X11ComponentPeer {
                 isTouchScroll = false;
                 touchBeginX = x;
                 touchBeginY = y;
+                sendWheelEventFromTouch(dev, jWhen, modifiers, touchBeginX, touchBeginY, TOUCH_BEGIN, 1);
                 break;
             case XConstants.XI_TouchUpdate:
-                if (isInsideTouchClickBoundaries(x, y)) {
+                if (!isTouchScroll && isInsideTouchClickBoundaries(x, y)) {
                     return;
                 }
-
-                if (!isTouchScroll) {
-                    sendWheelEventFromTouch(dev, jWhen, modifiers, touchBeginX, touchBeginY, TOUCH_BEGIN, 1);
-                    isTouchScroll = true;
-                }
+                isTouchScroll = true;
 
                 if (lastY - y != 0) {
                     sendWheelEventFromTouch(dev, jWhen, modifiers, x, y, TOUCH_UPDATE, lastY - y);
@@ -834,9 +831,8 @@ class XWindow extends XBaseWindow implements X11ComponentPeer {
                 }
                 break;
             case XConstants.XI_TouchEnd:
-                if (isTouchScroll) {
-                    sendWheelEventFromTouch(dev, jWhen, modifiers, x, y, TOUCH_END, 1);
-                } else {
+                sendWheelEventFromTouch(dev, jWhen, modifiers, x, y, TOUCH_END, 1);
+                if (!isTouchScroll) {
                     sendMouseEventFromTouch(dev, MouseEvent.MOUSE_PRESSED, jWhen, modifiers, touchBeginX, touchBeginY, button);
                     sendMouseEventFromTouch(dev, MouseEvent.MOUSE_RELEASED, jWhen, modifiers, touchBeginX, touchBeginY, button);
                     sendMouseEventFromTouch(dev, MouseEvent.MOUSE_CLICKED, jWhen, modifiers, touchBeginX, touchBeginY, button);

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

@@ -54,6 +54,8 @@ import sun.awt.X11GraphicsEnvironment;
 import sun.java2d.pipe.Region;
 import sun.util.logging.PlatformLogger;
 
+import sun.security.action.GetBooleanAction;
+
 class XWindowPeer extends XPanelPeer implements WindowPeer,
                                                 DisplayChangedListener {
 
@@ -63,6 +65,13 @@ class XWindowPeer extends XPanelPeer implements WindowPeer,
     private static final PlatformLogger grabLog = PlatformLogger.getLogger("sun.awt.X11.grab.XWindowPeer");
     private static final PlatformLogger iconLog = PlatformLogger.getLogger("sun.awt.X11.icon.XWindowPeer");
 
+    // workaround for JBR-1680 (see https://youtrack.jetbrains.com/issue/JBR-1680#focus=streamItem-27-3821223.0-0)
+    private static final boolean X11_DISABLE_OVERRIDE_FLAG = AccessController.doPrivileged(
+            new GetBooleanAction("x11.disable.override.flag"));
+    private static final boolean X11_DISABLE_OVERRIDE_XWINDOWPEER = AccessController.doPrivileged(
+            new GetBooleanAction("x11.disable.override.xwindowpeer"));
+
+
     // should be synchronized on awtLock
     private static Set<XWindowPeer> windows = new HashSet<XWindowPeer>();
 
@@ -158,7 +167,7 @@ class XWindowPeer extends XPanelPeer implements WindowPeer,
         XA_NET_WM_STATE = XAtom.get("_NET_WM_STATE");
 
 
-        params.put(OVERRIDE_REDIRECT, Boolean.valueOf(isOverrideRedirect()));
+        params.put(OVERRIDE_REDIRECT, X11_DISABLE_OVERRIDE_FLAG ? Boolean.FALSE : Boolean.valueOf(isOverrideRedirect()));
 
         SunToolkit.awtLock();
         try {
@@ -1246,6 +1255,8 @@ class XWindowPeer extends XPanelPeer implements WindowPeer,
     }
 
     boolean isOverrideRedirect() {
+        if (X11_DISABLE_OVERRIDE_XWINDOWPEER)
+            return false;
         return XWM.getWMID() == XWM.OPENLOOK_WM ||
             Window.Type.POPUP.equals(getWindowType());
     }

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

@@ -224,10 +224,11 @@ BOOL windowMoveLockHeld = FALSE;
 AwtComponent::AwtComponent()
 {
     m_mouseButtonClickAllowed = 0;
-    m_touchDownOccurred = FALSE;
-    m_touchUpOccurred = FALSE;
-    m_touchDownPoint.x = m_touchDownPoint.y = 0;
-    m_touchUpPoint.x = m_touchUpPoint.y = 0;
+
+    m_isTouchScroll = FALSE;
+    m_touchDownPoint = {0, 0};
+    m_lastTouchPoint = {0, 0};
+
     m_callbacksEnabled = FALSE;
     m_hwnd = NULL;
 
@@ -986,9 +987,9 @@ void AwtComponent::ReshapeNoScale(int x, int y, int w, int h)
     int usrX = x;
     int usrY = y;
 
-    AwtWin32GraphicsDevice* device = AwtWin32GraphicsDevice::GetDeviceByBounds(RECT_BOUNDS(x, y, w, h), GetHWnd());
-    x = device->ScaleUpDX(x);
-    y = device->ScaleUpDY(y);
+    AwtWin32GraphicsDevice* device = UGetDeviceByBounds(URectBounds(x, y, w, h, USER_SPACE), this);
+    x = device->ScaleUpX(x, RELATIVITY_FOR_COMP_XY(this));
+    y = device->ScaleUpY(y, RELATIVITY_FOR_COMP_XY(this));
     w = device->ScaleUpX(w);
     h = device->ScaleUpY(h);
 
@@ -1394,6 +1395,10 @@ void SpyWinMessage(HWND hwnd, UINT message, LPCTSTR szComment) {
 
 #endif /* SPY_MESSAGES */
 
+static BOOL IsMouseEventFromTouch()
+{
+    return (::GetMessageExtraInfo() & MOUSEEVENTF_FROMTOUCH) == MOUSEEVENTF_FROMTOUCH;
+}
 /*
  * Dispatch messages for this window class--general component
  */
@@ -1646,7 +1651,7 @@ LRESULT AwtComponent::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
               window->AwtSetActiveWindow(TRUE, LOWORD(lParam)/*hittest*/);
           }
           mr = mrConsume;
-          retValue = MA_NOACTIVATE;
+          retValue = AwtToolkit::GetInstance().IsActiveWindowTrackingEnabled() ? MA_ACTIVATE : MA_NOACTIVATE;
           break;
       }
       case WM_CTLCOLORMSGBOX:
@@ -1710,6 +1715,9 @@ LRESULT AwtComponent::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
       case WM_MOUSEHWHEEL:
       case WM_AWT_MOUSEENTER:
       case WM_AWT_MOUSEEXIT:
+          if (IsMouseEventFromTouch()) {
+              break;
+          }
           curPos = ::GetMessagePos();
           POINT myPos;
           myPos.x = GET_X_LPARAM(curPos);
@@ -2385,27 +2393,87 @@ void AwtComponent::WmTouch(WPARAM wParam, LPARAM lParam) {
 
     UINT inputsCount = LOWORD(wParam);
     TOUCHINPUT* pInputs = new TOUCHINPUT[inputsCount];
-    if (pInputs != NULL) {
-        if (tk.TIGetTouchInputInfo((HTOUCHINPUT)lParam, inputsCount, pInputs,
-                sizeof(TOUCHINPUT)) != 0) {
-            for (UINT i = 0; i < inputsCount; i++) {
-                TOUCHINPUT ti = pInputs[i];
-                if (ti.dwFlags & TOUCHEVENTF_PRIMARY) {
-                    if (ti.dwFlags & TOUCHEVENTF_DOWN) {
-                        m_touchDownPoint.x = ti.x / 100;
-                        m_touchDownPoint.y = ti.y / 100;
-                        ::ScreenToClient(GetHWnd(), &m_touchDownPoint);
-                        m_touchDownOccurred = TRUE;
-                    } else if (ti.dwFlags & TOUCHEVENTF_UP) {
-                        m_touchUpPoint.x = ti.x / 100;
-                        m_touchUpPoint.y = ti.y / 100;
-                        ::ScreenToClient(GetHWnd(), &m_touchUpPoint);
-                        m_touchUpOccurred = TRUE;
-                    }
-                }
-            }
+    if (tk.TIGetTouchInputInfo((HTOUCHINPUT)lParam, inputsCount, pInputs,
+                               sizeof(TOUCHINPUT)) != 0) {
+        for (UINT i = 0; i < inputsCount; i++) {
+            WmTouchHandler(pInputs[i]);
+        }
+    }
+    delete[] pInputs;
+}
+
+BOOL AwtComponent::IsInsideTouchClickBoundaries(POINT p)
+{
+    return abs(p.x - m_touchDownPoint.x) <= TOUCH_MOUSE_COORDS_DELTA &&
+           abs(p.y - m_touchDownPoint.y) <= TOUCH_MOUSE_COORDS_DELTA;
+}
+
+POINT AwtComponent::TouchCoordsToLocal(LONG x, LONG y)
+{
+    POINT p{TOUCH_COORD_TO_PIXEL(x), TOUCH_COORD_TO_PIXEL(y)};
+    ::ScreenToClient(GetHWnd(), &p);
+    return p;
+}
+
+void AwtComponent::SendMouseWheelEventFromTouch(POINT p, jint modifiers, jint scrollType, jint pixels)
+{
+    SendMouseWheelEvent(java_awt_event_MouseEvent_MOUSE_WHEEL, ::JVM_CurrentTimeMillis(NULL, 0),
+                        p.x, p.y, modifiers, 0, 0, scrollType,
+                        /*scrollAmount*/ 1, pixels,
+                        static_cast<double>(pixels), /*msg*/ nullptr);
+}
+
+void AwtComponent::SendMouseEventFromTouch(jint id, POINT p, jint modifiers)
+{
+    SendMouseEvent(id, ::JVM_CurrentTimeMillis(NULL, 0), p.x, p.y,
+                   modifiers, /*clickCount*/ 1, JNI_FALSE,
+                   java_awt_event_MouseEvent_BUTTON1,
+                   /*msg*/ nullptr, /*causedByTouchEvent*/ TRUE);
+}
+
+void AwtComponent::WmTouchHandler(const TOUCHINPUT& touchInput)
+{
+    // skip multitouch, remove after gesture support
+    if (!(touchInput.dwFlags & TOUCHEVENTF_PRIMARY)) {
+        return;
+    }
+
+    jint modifiers = GetJavaModifiers();
+    // turn off horizontal
+    modifiers &= ~java_awt_event_InputEvent_SHIFT_DOWN_MASK;
+    const POINT p = TouchCoordsToLocal(touchInput.x, touchInput.y);
+
+    if (touchInput.dwFlags & TOUCHEVENTF_DOWN) {
+        m_touchDownPoint = p;
+        m_lastTouchPoint = p;
+        m_isTouchScroll = FALSE;
+        SendMouseWheelEventFromTouch(p, modifiers, TOUCH_BEGIN, 1);
+    } else if (touchInput.dwFlags & TOUCHEVENTF_MOVE) {
+        if (!m_isTouchScroll && IsInsideTouchClickBoundaries(p)) {
+            return;
+        }
+        m_isTouchScroll = TRUE;
+
+        const int deltaY = ScaleDownY(static_cast<int>(m_lastTouchPoint.y - p.y));
+        if (abs(deltaY) != 0) {
+            SendMouseWheelEventFromTouch(p, modifiers, TOUCH_UPDATE, deltaY);
+        }
+        
+        const int deltaX = ScaleDownX(static_cast<int>(m_lastTouchPoint.x - p.x));
+        if (abs(deltaX) != 0) {
+            modifiers |= java_awt_event_InputEvent_SHIFT_DOWN_MASK;
+            SendMouseWheelEventFromTouch(p, modifiers, TOUCH_UPDATE, deltaX);
+        }
+
+        m_lastTouchPoint = p;
+    } else if (touchInput.dwFlags & TOUCHEVENTF_UP) {
+        SendMouseWheelEventFromTouch(p, modifiers, TOUCH_END, 1);
+
+        if (!m_isTouchScroll) {
+            SendMouseEventFromTouch(java_awt_event_MouseEvent_MOUSE_PRESSED, p, modifiers);
+            SendMouseEventFromTouch(java_awt_event_MouseEvent_MOUSE_RELEASED, p, modifiers);
+            SendMouseEventFromTouch(java_awt_event_MouseEvent_MOUSE_CLICKED, p, modifiers);
         }
-        delete[] pInputs;
     }
 }
 
@@ -2451,14 +2519,6 @@ MsgRouting AwtComponent::WmMouseDown(UINT flags, int x, int y, int button)
     m_mouseButtonClickAllowed |= GetButtonMK(button);
     lastTime = now;
 
-    BOOL causedByTouchEvent = FALSE;
-    if (m_touchDownOccurred &&
-        (abs(m_touchDownPoint.x - x) <= TOUCH_MOUSE_COORDS_DELTA) &&
-        (abs(m_touchDownPoint.y - y) <= TOUCH_MOUSE_COORDS_DELTA)) {
-        causedByTouchEvent = TRUE;
-        m_touchDownOccurred = FALSE;
-    }
-
     MSG msg;
     InitMessage(&msg, lastMessage, flags, MAKELPARAM(x, y), x, y);
 
@@ -2477,7 +2537,7 @@ MsgRouting AwtComponent::WmMouseDown(UINT flags, int x, int y, int button)
 
     SendMouseEvent(java_awt_event_MouseEvent_MOUSE_PRESSED, now, x, y,
                    GetJavaModifiers(), clickCount, JNI_FALSE,
-                   GetButton(button), &msg, causedByTouchEvent);
+                   GetButton(button), &msg, /*causedByTouchEvent*/ FALSE);
     /*
      * NOTE: this call is intentionally placed after all other code,
      * since AwtComponent::WmMouseDown() assumes that the cached id of the
@@ -2499,21 +2559,13 @@ MsgRouting AwtComponent::WmMouseDown(UINT flags, int x, int y, int button)
 
 MsgRouting AwtComponent::WmMouseUp(UINT flags, int x, int y, int button)
 {
-    BOOL causedByTouchEvent = FALSE;
-    if (m_touchUpOccurred &&
-        (abs(m_touchUpPoint.x - x) <= TOUCH_MOUSE_COORDS_DELTA) &&
-        (abs(m_touchUpPoint.y - y) <= TOUCH_MOUSE_COORDS_DELTA)) {
-        causedByTouchEvent = TRUE;
-        m_touchUpOccurred = FALSE;
-    }
-
     MSG msg;
     InitMessage(&msg, lastMessage, flags, MAKELPARAM(x, y), x, y);
 
     SendMouseEvent(java_awt_event_MouseEvent_MOUSE_RELEASED, ::JVM_CurrentTimeMillis(NULL, 0),
                    x, y, GetJavaModifiers(), clickCount,
                    (GetButton(button) == java_awt_event_MouseEvent_BUTTON3 ?
-                    TRUE : FALSE), GetButton(button), &msg, causedByTouchEvent);
+                    TRUE : FALSE), GetButton(button), &msg, /*causedByTouchEvent*/ FALSE);
     /*
      * If no movement, then report a click following the button release.
      * When WM_MOUSEUP comes to a window without previous WM_MOUSEDOWN,
@@ -3955,8 +4007,8 @@ void AwtComponent::OpenCandidateWindow(int x, int y)
     }
     HWND hTop = GetTopLevelParentForWindow(hWnd);
     ::ClientToScreen(hTop, &p);
-    int sx = ScaleUpDX(x) - p.x;
-    int sy = ScaleUpDY(y) - p.y;
+    int sx = ScaleUpX(x, ABSOLUTE_COORD) - p.x;
+    int sy = ScaleUpY(y, ABSOLUTE_COORD) - p.y;
     if (!m_bitsCandType) {
         SetCandidateWindow(m_bitsCandType, sx, sy);
         return;
@@ -4834,7 +4886,8 @@ void AwtComponent::FillAlpha(void *bitmapBits, SIZE &size, BYTE alpha)
     }
 }
 
-int AwtComponent::ScaleUpX(int x) {
+int AwtComponent::ScaleUpX(int x, const UCoordRelativity& relativity) {
+    if (relativity == ABSOLUTE_COORD) return ScaleUpDX(x);
     int screen = AwtWin32GraphicsDevice::DeviceIndexForWindow(GetHWnd());
     Devices::InstanceAccess devices;
     AwtWin32GraphicsDevice* device = devices->GetDevice(screen);
@@ -4848,7 +4901,8 @@ int AwtComponent::ScaleUpDX(int x) {
     return device == NULL ? x : device->ScaleUpDX(x);
 }
 
-int AwtComponent::ScaleUpY(int y) {
+int AwtComponent::ScaleUpY(int y, const UCoordRelativity& relativity) {
+    if (relativity == ABSOLUTE_COORD) return ScaleUpDY(y);
     int screen = AwtWin32GraphicsDevice::DeviceIndexForWindow(GetHWnd());
     Devices::InstanceAccess devices;
     AwtWin32GraphicsDevice* device = devices->GetDevice(screen);
@@ -4862,7 +4916,8 @@ int AwtComponent::ScaleUpDY(int y) {
     return device == NULL ? y : device->ScaleUpDY(y);
 }
 
-int AwtComponent::ScaleDownX(int x) {
+int AwtComponent::ScaleDownX(int x, const UCoordRelativity& relativity) {
+    if (relativity == ABSOLUTE_COORD) return ScaleDownDX(x);
     int screen = AwtWin32GraphicsDevice::DeviceIndexForWindow(GetHWnd());
     Devices::InstanceAccess devices;
     AwtWin32GraphicsDevice* device = devices->GetDevice(screen);
@@ -4876,7 +4931,8 @@ int AwtComponent::ScaleDownDX(int x) {
     return device == NULL ? x : device->ScaleDownDX(x);
 }
 
-int AwtComponent::ScaleDownY(int y) {
+int AwtComponent::ScaleDownY(int y, const UCoordRelativity& relativity) {
+    if (relativity == ABSOLUTE_COORD) return ScaleUpDY(y);
     int screen = AwtWin32GraphicsDevice::DeviceIndexForWindow(GetHWnd());
     Devices::InstanceAccess devices;
     AwtWin32GraphicsDevice* device = devices->GetDevice(screen);
@@ -7380,8 +7436,8 @@ void AwtComponent::VerifyState()
         target = parent;
     }
 
-    x = ScaleUpDX(x);
-    y = ScaleUpDY(y);
+    x = ScaleUpX(x, RELATIVITY_FOR_COMP_XY(this));
+    y = ScaleUpY(y, RELATIVITY_FOR_COMP_XY(this));
     width = ScaleUpX(width);
     height = ScaleUpY(height);
 

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

@@ -32,6 +32,8 @@
 #include "awt_Brush.h"
 #include "awt_Pen.h"
 #include "awt_Win32GraphicsDevice.h"
+#include "awt_Util.h"
+
 #include "GDIWindowSurfaceData.h"
 
 #include "java_awt_Component.h"
@@ -71,6 +73,9 @@ const int X_BUTTONS = MK_XBUTTON1|MK_XBUTTON2;
 // corresponding WM_LBUTTONDOWN/WM_LBUTTONUP event letting to associate these
 // events, when their coordinates are slightly different.
 const int TOUCH_MOUSE_COORDS_DELTA = 10;
+const int TOUCH_BEGIN = 2;
+const int TOUCH_UPDATE = 3;
+const int TOUCH_END = 4;
 
 // Whether to check for embedded frame and adjust location
 #define CHECK_EMBEDDED 0
@@ -532,6 +537,11 @@ public:
     virtual MsgRouting WmWindowPosChanging(LPARAM windowPos);
     virtual MsgRouting WmWindowPosChanged(LPARAM windowPos);
     virtual void WmTouch(WPARAM wParam, LPARAM lParam);
+    void WmTouchHandler(const TOUCHINPUT& touchInput);
+    BOOL IsInsideTouchClickBoundaries(POINT p);
+    POINT TouchCoordsToLocal(LONG x, LONG y);
+    void SendMouseWheelEventFromTouch(POINT p, jint modifiers, jint scrollType, jint pixels);
+    void SendMouseEventFromTouch(jint id, POINT p, jint modifiers);
 
     // NB: 64-bit: vkey is wParam of the message, but other API's take
     // vkey parameters of type UINT, so we do the cast before dispatching.
@@ -728,10 +738,10 @@ public:
         return m_bPauseDestroy;
     }
 
-    int ScaleUpX(int x);
-    int ScaleUpY(int y);
-    int ScaleDownX(int x);
-    int ScaleDownY(int y);
+    int ScaleUpX(int x, const UCoordRelativity& relativity = RELATIVE_COORD);
+    int ScaleUpY(int y, const UCoordRelativity& relativity = RELATIVE_COORD);
+    int ScaleDownX(int x, const UCoordRelativity& relativity = RELATIVE_COORD);
+    int ScaleDownY(int y, const UCoordRelativity& relativity = RELATIVE_COORD);
     int ScaleUpDX(int x);
     int ScaleUpDY(int y);
     int ScaleDownDX(int x);
@@ -781,10 +791,9 @@ private:
     */
     UINT m_mouseButtonClickAllowed;
 
-    BOOL m_touchDownOccurred;
-    BOOL m_touchUpOccurred;
+    BOOL m_isTouchScroll;
     POINT m_touchDownPoint;
-    POINT m_touchUpPoint;
+    POINT m_lastTouchPoint;
 
     BOOL m_bSubclassed;
     BOOL m_bPauseDestroy;

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

@@ -1543,8 +1543,8 @@ void AwtFrame::_SetMaximizedBounds(void *param)
     if (::IsWindow(f->GetHWnd()))
     {
         DASSERT(!::IsBadReadPtr(f, sizeof(AwtFrame)));
-        x = f->ScaleUpDX(x);
-        y = f->ScaleUpDY(y);
+        x = f->ScaleUpX(x, ABSOLUTE_COORD);
+        y = f->ScaleUpY(y, ABSOLUTE_COORD);
         width = f->ScaleUpX(width);
         height = f->ScaleUpY(height);
         f->SetMaximizedBounds(x, y, width, height);

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

@@ -700,6 +700,13 @@ BOOL AwtToolkit::Initialize(BOOL localPump) {
     tk.m_touchKbrdAutoShowIsEnabled = env->CallStaticBooleanMethod(
         sunToolkitCls, isTouchKeyboardAutoShowEnabledMID);
 
+    BOOL tracking = FALSE;
+    int result = 0;
+    result = ::SystemParametersInfo(SPI_GETACTIVEWINDOWTRACKING, 0,
+                                  &tracking, 0);
+
+    tk.m_active_window_tracking_mode_enabled = (tracking && (result != 0));
+
     CATCH_BAD_ALLOC_RET(FALSE);
 
     if (tk.m_isWin8OrLater && tk.m_touchKbrdAutoShowIsEnabled) {
@@ -803,6 +810,10 @@ BOOL AwtToolkit::IsDynamicLayoutSet() {
     return m_isDynamicLayoutSet;
 }
 
+BOOL AwtToolkit::IsActiveWindowTrackingEnabled() {
+    return m_active_window_tracking_mode_enabled;
+}
+
 BOOL AwtToolkit::IsDynamicLayoutSupported() {
     // SPI_GETDRAGFULLWINDOWS is only supported on Win95 if
     // Windows Plus! is installed.  Otherwise, box frame resize.

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

@@ -198,6 +198,13 @@ class CriticalSection {
     #define TOUCHEVENTF_NOCOALESCE      0x0020
     #define TOUCHEVENTF_PEN             0x0040
     #define TOUCHEVENTF_PALM            0x0080
+
+    #define MOUSEEVENTF_FROMTOUCH       0xFF515700
+    
+    /*
+    * Conversion of touch input coordinates to pixels
+    */
+    #define TOUCH_COORD_TO_PIXEL(l)         ((l) / 100)
 #endif
 
 /************************************************************************
@@ -233,6 +240,7 @@ public:
     void SetDynamicLayout(BOOL dynamic);
     BOOL IsDynamicLayoutSet();
     BOOL IsDynamicLayoutSupported();
+    BOOL IsActiveWindowTrackingEnabled();
     BOOL IsDynamicLayoutActive();
     BOOL areExtraMouseButtonsEnabled();
     void setExtraMouseButtonsEnabled(BOOL enable);
@@ -470,6 +478,7 @@ private:
     BOOL m_isActive; // set to FALSE at beginning of Dispose
     BOOL m_isDisposed; // set to TRUE at end of Dispose
     BOOL m_areExtraMouseButtonsEnabled;
+    BOOL m_active_window_tracking_mode_enabled;
 
     typedef BOOL (WINAPI *RegisterTouchWindowFunc)(HWND hWnd, ULONG ulFlags);
     typedef BOOL (WINAPI *GetTouchInputInfoFunc)(HTOUCHINPUT hTouchInput,

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

@@ -0,0 +1,32 @@
+// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+
+#include "awt_Util.h"
+#include "awt_Component.h"
+#include "awt_Win32GraphicsDevice.h"
+#include "awt_Win32GraphicsConfig.h"
+
+AwtWin32GraphicsDevice* UGetDeviceByBounds(const URectBounds& bounds, AwtComponent* comp)
+{
+    URectBounds _bounds(bounds);
+    if (comp != NULL && !comp->IsTopLevel()) {
+        // use the ancestor window to match the device
+        _bounds = UGetWindowRectBounds(::GetAncestor(comp->GetHWnd(), GA_ROOT));
+    }
+    Devices::InstanceAccess devices;
+    POINT center = {_bounds.x + _bounds.width / 2, _bounds.y + _bounds.height / 2};
+    for (int i = 0; i < devices->GetNumDevices(); i++) {
+        RECT rect = AwtWin32GraphicsConfig::getMonitorBounds(i, _bounds.space);
+        if (::PtInRect(&rect, center)) {
+            return devices->GetDevice(i);
+        }
+    }
+    // default to the hwnd's device
+    return comp != NULL ? devices->GetDevice(AwtWin32GraphicsDevice::DeviceIndexForWindow(comp->GetHWnd())) : NULL;
+}
+
+URectBounds UGetWindowRectBounds(HWND hwnd)
+{
+    RECT r;
+    ::GetWindowRect(hwnd, &r);
+    return URectBounds(r.left, r.top, r.right - r.left, r.bottom - r.top, DEVICE_SPACE);
+}

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

@@ -0,0 +1,47 @@
+// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+
+#ifndef NATIVE_AWT_UTIL_H
+#define NATIVE_AWT_UTIL_H
+
+#include <windows.h>
+
+typedef enum {
+    DEVICE_SPACE,
+    USER_SPACE
+} UCoordSpace;
+
+typedef enum {
+    RELATIVE_COORD,
+    ABSOLUTE_COORD
+} UCoordRelativity;
+
+#define RELATIVITY_FOR_COMP_XY(compPtr) compPtr->IsTopLevel() ? ABSOLUTE_COORD : RELATIVE_COORD
+
+typedef struct URectBounds {
+    int x;
+    int y;
+    int width;
+    int height;
+    UCoordSpace space;
+
+    URectBounds(int _x, int _y, int _w, int _h, const UCoordSpace& _space) : x(_x), y(_y), width(_w), height(_h), space(_space) {}
+
+    URectBounds(const URectBounds& b) : x(b.x), y(b.y), width(b.width), height(b.height), space(b.space) {}
+
+    URectBounds& operator=(const URectBounds& b) {
+        x = b.x;
+        y = b.y;
+        width = b.width;
+        height = b.height;
+        space = b.space;
+        return *this;
+    }
+} URectBounds;
+
+class AwtComponent;
+class AwtWin32GraphicsDevice;
+
+URectBounds UGetWindowRectBounds(HWND hwnd);
+AwtWin32GraphicsDevice* UGetDeviceByBounds(const URectBounds& bounds, AwtComponent* comp = NULL);
+
+#endif //NATIVE_AWT_UTIL_H

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

@@ -77,7 +77,7 @@ inline int shiftToMask(int numBits, int shift) {
     return mask;
 }
 
-RECT AwtWin32GraphicsConfig::getMonitorBounds(int screen)
+RECT AwtWin32GraphicsConfig::getMonitorBounds(int screen, const UCoordSpace& space)
 {
     RECT rRW = {0, 0, 0, 0};
     Devices::InstanceAccess devices;
@@ -87,9 +87,9 @@ RECT AwtWin32GraphicsConfig::getMonitorBounds(int screen)
         // don't scale xy to avoid overlapping of the multi-dpi-monitors bounds in the user space
         int x = rRW.left;
         int y = rRW.top;
-        int w = (device == NULL) ? rRW.right - rRW.left
+        int w = (device == NULL || space == DEVICE_SPACE) ? rRW.right - rRW.left
                                  : device->ScaleDownX(rRW.right - rRW.left);
-        int h = (device == NULL) ? rRW.bottom - rRW.top
+        int h = (device == NULL || space == DEVICE_SPACE) ? rRW.bottom - rRW.top
                                  : device->ScaleDownY(rRW.bottom - rRW.top);
 
         ::SetRect(&rRW, x, y, x + w, y + h);
@@ -100,8 +100,8 @@ RECT AwtWin32GraphicsConfig::getMonitorBounds(int screen)
         int w = ::GetSystemMetrics(SM_CXSCREEN);
         int h = ::GetSystemMetrics(SM_CYSCREEN);
 
-        ::SetRect(&rRW, 0, 0, device == NULL ? w : device->ScaleDownX(w),
-                              device == NULL ? h : device->ScaleDownY(h));
+        ::SetRect(&rRW, 0, 0, device == NULL || space == DEVICE_SPACE ? w : device->ScaleDownX(w),
+                              device == NULL || space == DEVICE_SPACE ? h : device->ScaleDownY(h));
     }
     return rRW;
 }
@@ -123,7 +123,7 @@ JNIEXPORT jobject JNICALL
     CHECK_NULL_RETURN(clazz, NULL);
     mid = env->GetMethodID(clazz, "<init>", "(IIII)V");
     if (mid != 0) {
-        RECT r = AwtWin32GraphicsConfig::getMonitorBounds((int)screen);
+        RECT r = AwtWin32GraphicsConfig::getMonitorBounds((int)screen, USER_SPACE);
         bounds = env->NewObject(clazz, mid, r.left, r.top, r.right - r.left, r.bottom - r.top);
         if (safe_ExceptionOccurred(env)) {
            return 0;

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

@@ -27,12 +27,13 @@
 #define AWT_WIN32GRAPHICSCONFIG_H
 
 #include "awt.h"
+#include "awt_Win32GraphicsDevice.h"
 
 class AwtWin32GraphicsConfig {
 public:
         /* sun.awt.Win32GraphicsConfig fields and method IDs */
         static jfieldID win32GCVisualID;
-        static RECT getMonitorBounds(int screen);
+        static RECT getMonitorBounds(int screen, const UCoordSpace& space);
 };
 
 #endif /* AWT_WIN32GRAPHICSCONFIG_H */

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

@@ -631,45 +631,45 @@ void AwtWin32GraphicsDevice::SetScale(float sx, float sy)
     scaleY = sy;
 }
 
-int AwtWin32GraphicsDevice::ScaleUpX(int x)
+int AwtWin32GraphicsDevice::ScaleUpX(int x, const UCoordRelativity& relativity)
 {
-    return ClipRound(x * scaleX);
+    return relativity == RELATIVE_COORD ? ClipRound(x * scaleX) : ScaleUpDX(x);
 }
 
 // scale up the delta [x - device.x]
 int AwtWin32GraphicsDevice::ScaleUpDX(int x)
 {
-    RECT devBounds = AwtWin32GraphicsConfig::getMonitorBounds(screen);
+    RECT devBounds = AwtWin32GraphicsConfig::getMonitorBounds(screen, DEVICE_SPACE);
     return devBounds.left + ClipRound((x - devBounds.left) * scaleX);
 }
 
-int AwtWin32GraphicsDevice::ScaleUpY(int y)
+int AwtWin32GraphicsDevice::ScaleUpY(int y, const UCoordRelativity& relativity)
 {
-    return ClipRound(y * scaleY);
+    return relativity == RELATIVE_COORD ? ClipRound(y * scaleY) : ScaleUpDY(y);
 }
 
 // scale up the delta [y - device.y]
 int AwtWin32GraphicsDevice::ScaleUpDY(int y)
 {
-    RECT devBounds = AwtWin32GraphicsConfig::getMonitorBounds(screen);
+    RECT devBounds = AwtWin32GraphicsConfig::getMonitorBounds(screen, DEVICE_SPACE);
     return devBounds.top + ClipRound((y - devBounds.top) * scaleY);
 }
 
-int AwtWin32GraphicsDevice::ScaleDownX(int x)
+int AwtWin32GraphicsDevice::ScaleDownX(int x, const UCoordRelativity& relativity)
 {
-    return ClipRound(x / scaleX);
+    return relativity == RELATIVE_COORD ? ClipRound(x / scaleX) : ScaleDownDX(x);
 }
 
 // scale down the delta [x - device.x]
 int AwtWin32GraphicsDevice::ScaleDownDX(int x)
 {
-    RECT devBounds = AwtWin32GraphicsConfig::getMonitorBounds(screen);
+    RECT devBounds = AwtWin32GraphicsConfig::getMonitorBounds(screen, USER_SPACE);
     return devBounds.left + ClipRound((x - devBounds.left) / scaleX);
 }
 
-int AwtWin32GraphicsDevice::ScaleDownY(int y)
+int AwtWin32GraphicsDevice::ScaleDownY(int y, const UCoordRelativity& relativity)
 {
-    return ClipRound(y / scaleY);
+    return relativity == RELATIVE_COORD ? ClipRound(y / scaleY) : ScaleDownDY(y);
 }
 
 int AwtWin32GraphicsDevice::ClipRound(double value)
@@ -691,7 +691,7 @@ int AwtWin32GraphicsDevice::ClipRound(double value)
 // scale down the delta [y - device.y]
 int AwtWin32GraphicsDevice::ScaleDownDY(int y)
 {
-    RECT devBounds = AwtWin32GraphicsConfig::getMonitorBounds(screen);
+    RECT devBounds = AwtWin32GraphicsConfig::getMonitorBounds(screen, USER_SPACE);
     return devBounds.top + ClipRound((y - devBounds.top) / scaleY);
 }
 
@@ -947,20 +947,6 @@ BOOL AwtWin32GraphicsDevice::IsUiScaleEnabled()
                                       "()Z").z;
 }
 
-AwtWin32GraphicsDevice* AwtWin32GraphicsDevice::GetDeviceByBounds(RECT_BOUNDS bounds, HWND hwnd) // bounds in user space
-{
-    Devices::InstanceAccess devices;
-    POINT center = {bounds.x + bounds.width / 2, bounds.y + bounds.height / 2};
-    for (int i = 0; i < devices->GetNumDevices(); i++) {
-        RECT rect = AwtWin32GraphicsConfig::getMonitorBounds(i); // rect in user space
-        if (::PtInRect(&rect, center)) {
-            return devices->GetDevice(i);
-        }
-    }
-    // default to the hwnd's device
-    return hwnd != NULL ? devices->GetDevice(AwtWin32GraphicsDevice::DeviceIndexForWindow(hwnd)) : NULL;
-}
-
     const DWORD REQUIRED_FLAGS = (   //Flags which must be set in
      PFD_SUPPORT_GDI |               //in the PixelFormatDescriptor.
      PFD_DRAW_TO_WINDOW);            //Used to choose the default config

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

@@ -33,14 +33,7 @@ extern "C" {
 #include "colordata.h"
 #include "awt_Palette.h"
 #include "Devices.h"
-
-struct RECT_BOUNDS {
-    int x;
-    int y;
-    int width;
-    int height;
-    RECT_BOUNDS(int _x, int _y, int _w, int _h) : x(_x), y(_y), width(_w), height(_h) {}
-};
+#include "awt_Util.h"
 
 class AwtPalette;
 class Devices;
@@ -78,10 +71,10 @@ public:
     void                    SetScale(float scaleX, float scaleY);
     float                   GetScaleX();
     float                   GetScaleY();
-    int                     ScaleUpX(int x);
-    int                     ScaleUpY(int y);
-    int                     ScaleDownX(int x);
-    int                     ScaleDownY(int y);
+    int                     ScaleUpX(int x, const UCoordRelativity& relativity = RELATIVE_COORD);
+    int                     ScaleUpY(int y, const UCoordRelativity& relativity = RELATIVE_COORD);
+    int                     ScaleDownX(int x, const UCoordRelativity& relativity = RELATIVE_COORD);
+    int                     ScaleDownY(int y, const UCoordRelativity& relativity = RELATIVE_COORD);
     int                     ScaleUpDX(int x);
     int                     ScaleUpDY(int y);
     int                     ScaleDownDX(int x);
@@ -107,14 +100,6 @@ public:
     static HDC              GetDCFromScreen(int screen);
     static int              GetScreenFromHMONITOR(HMONITOR mon);
     static BOOL             IsUiScaleEnabled(); // if not, be dpi-unaware (backward compatible behaviour)
-    static AwtWin32GraphicsDevice* GetDeviceByBounds(RECT_BOUNDS bounds , HWND hwnd = NULL); // bounds in user space
-
-    inline static RECT_BOUNDS GetWindowRect(HWND hwnd)
-    {
-        RECT r;
-        ::GetWindowRect(hwnd, &r);
-        return RECT_BOUNDS(r.left, r.top, r.right - r.left, r.bottom - r.top);
-    }
 
     static int              primaryIndex;
     static BOOL             primaryPalettized;

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

@@ -40,6 +40,7 @@
 #include "awt_IconCursor.h"
 #include "ComCtl32Util.h"
 #include "math.h"
+#include "awt_Util.h"
 
 #include "java_awt_Insets.h"
 #include <java_awt_Container.h>
@@ -1179,6 +1180,9 @@ AwtWindow* AwtWindow::Create(jobject self, jobject parent)
             if (env->ExceptionCheck()) goto done;
             DWORD style = WS_CLIPCHILDREN | WS_POPUP;
             DWORD exStyle = WS_EX_NOACTIVATE;
+            if (JNU_CallMethodByName(env, NULL, target, "isIgnoreMouseEvents", "()Z").z) {
+                exStyle |= WS_EX_LAYERED | WS_EX_TRANSPARENT;
+            }
             if (GetRTL()) {
                 exStyle |= WS_EX_RIGHT | WS_EX_LEFTSCROLLBAR;
                 if (GetRTLReadingOrder())
@@ -1867,8 +1871,8 @@ MsgRouting AwtWindow::WmMove(int x, int y)
     jobject peer = GetPeer(env);
     jobject target = env->GetObjectField(peer, AwtObject::targetID);
 
-    RECT_BOUNDS rect = AwtWin32GraphicsDevice::GetWindowRect(GetHWnd());
-    AwtWin32GraphicsDevice* device = AwtWin32GraphicsDevice::GetDeviceByBounds(rect, GetHWnd());
+    URectBounds rect = UGetWindowRectBounds(GetHWnd());
+    AwtWin32GraphicsDevice* device = UGetDeviceByBounds(rect, this);
 
     int usrX = device->ScaleDownDX(rect.x);
     int usrY = device->ScaleDownDY(rect.y);
@@ -1982,8 +1986,8 @@ MsgRouting AwtWindow::WmSize(UINT type, int w, int h)
     BOOL insetsChanged = UpdateInsets(NULL);
     int newWidth = w + m_insets.left + m_insets.right;
     int newHeight = h + m_insets.top + m_insets.bottom;
-    RECT_BOUNDS rect = AwtWin32GraphicsDevice::GetWindowRect(GetHWnd());
-    AwtWin32GraphicsDevice* device = AwtWin32GraphicsDevice::GetDeviceByBounds(rect, GetHWnd());
+    URectBounds rect = UGetWindowRectBounds(GetHWnd());
+    AwtWin32GraphicsDevice* device = UGetDeviceByBounds(rect, this);
     (env)->SetIntField(target, AwtComponent::widthID, device->ScaleDownX(newWidth));
     (env)->SetIntField(target, AwtComponent::heightID, device->ScaleDownY(newHeight));
 

test/hotspot/jtreg/jbProblemList.txt

@@ -38,7 +38,7 @@
 #
 #############################################################################
 
-applications/jcstress/acqrel/Test.java generic-all
+applications/jcstress/acqrel/Test.java - generic-all
 
 # :hotspot_compiler
 
@@ -47,15 +47,20 @@ compiler/codecache/stress/OverloadCompileQueueTest.java
 compiler/codegen/Test6896617.java                                                   8193479 generic-all
 compiler/codegen/aes/TestCipherBlockChainingEncrypt.java                            8219513 generic-all
 compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java                     8140405 generic-all
+compiler/escapeAnalysis/TestSelfArrayCopy.java                                      8229016 macosx-all,linux-all
+compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java                  8209459 linux-aarch64
 compiler/jsr292/ContinuousCallSiteTargetChange.java                                 8222030 generic-all
 compiler/jvmci/compilerToVM/GetFlagValueTest.java                                   8204459 generic-all
 compiler/jvmci/compilerToVM/GetResolvedJavaTypeTest.java                            8158860 generic-all
 compiler/jvmci/compilerToVM/InvalidateInstalledCodeTest.java                        8163894 generic-all
+compiler/loopopts/SplitIfSharedFastLockBehindCastPP.java                            8235762 linux-all,macosx-all
+compiler/loopopts/TestDivZeroCheckControl.java                                      8229496 macosx-all
 compiler/tiered/LevelTransitionTest.java                                            8067651 generic-all
 compiler/types/correctness/CorrectnessTest.java                                     8066173 generic-all
 compiler/types/correctness/OffTest.java                                             8066173 generic-all
 
 compiler/c2/Test6852078.java                                                        8194310 generic-all
+compiler/c2/Test6857159.java                                                        8234290 generic-all
 
 applications/ctw/modules/java_desktop.java 8189604 windows-all
 applications/ctw/modules/java_desktop_2.java 8189604,8204842 generic-all
@@ -71,16 +76,20 @@ gc/g1/humongousObjects/objectGraphTest/TestObjectGraphAfterGC.java
 gc/survivorAlignment/TestPromotionToSurvivor.java                                   8129886 generic-all
 gc/g1/logging/TestG1LoggingFailure.java                                             8169634 generic-all
 gc/g1/humongousObjects/TestHeapCounters.java                                        8178918 generic-all
+gc/g1/humongousObjects/TestHumongousClassLoader.java                                8225186 linux-all,windows-all
+gc/metaspace/TestCapacityUntilGCWrapAround.java                                     8226236 windows-x86
 gc/stress/gclocker/TestGCLockerWithParallel.java                                    8180622 generic-all
 gc/stress/gclocker/TestGCLockerWithG1.java                                          8180622 generic-all
 gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java            8177765 generic-all
 gc/stress/TestJNIBlockFullGC/TestJNIBlockFullGC.java                                8192647 generic-all
 gc/stress/TestReclaimStringsLeaksMemory.java                                        8224847 generic-all
+gc/stress/TestStressG1Humongous.java                                                JBR-2062 generic-x86
 
 #############################################################################
 
 # :hotspot_runtime
 
+runtime/BootstrapMethod/TestLambdaExceptionInInitializer.java                       8208172 macosx-all
 runtime/CompressedOops/UseCompressedOops.java                                       8079353 generic-all
 runtime/NMT/MallocStressTest.java                                                   8079353 generic-all
 runtime/SelectionResolution/InvokeInterfaceICCE.java                                8224795 generic-all
@@ -89,50 +98,54 @@ runtime/SelectionResolution/InvokeVirtualSuccessTest.java
 runtime/SharedArchiveFile/SASymbolTableTest.java                                    8193639 solaris-all
 vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x001/TestDescription.java                 8013728 generic-all
 runtime/memory/ReadFromNoaccessArea.java                                            nobug   generic-all crash is the expected behaviour
+runtime/modules/ModuleStress/ExportModuleStressTest.java                            8230055 windows-all
+runtime/modules/ModuleStress/ModuleStressGC.java                                    8230055 windows-all
 
 #############################################################################
 
 # :hotspot_serviceability
 
-serviceability/sa/ClhsdbAttach.java                                                 8193639 solaris-all
-serviceability/sa/ClhsdbCDSCore.java                                                8207832 linux-all,generic-all crash is the expected behaviour
+serviceability/logging/TestQuotedLogOutputs.java                                    8224505 windows-all
+
+serviceability/sa/ClhsdbAttach.java                                                 8193639,8194687 solaris-all,windows-x86
+serviceability/sa/ClhsdbCDSCore.java                                                8207832,8194687 linux-all,generic-all crash is the expected behaviour
 serviceability/sa/ClhsdbCDSJstackPrintAll.java                                      8193639 solaris-all
-serviceability/sa/ClhsdbField.java                                                  8193639 solaris-all
-serviceability/sa/ClhsdbFindPC.java                                                 8193639 solaris-all
-serviceability/sa/ClhsdbFlags.java                                                  8193639 solaris-all
-serviceability/sa/ClhsdbInspect.java                                                8193639 solaris-all
-serviceability/sa/ClhsdbJdis.java                                                   8193639 solaris-all
-serviceability/sa/ClhsdbJhisto.java                                                 8193639 solaris-all
-serviceability/sa/ClhsdbJstack.java                                                 8193639 solaris-all
-serviceability/sa/ClhsdbLongConstant.java                                           8193639 solaris-all
-serviceability/sa/ClhsdbPmap.java                                                   8193639 solaris-all
+serviceability/sa/ClhsdbField.java                                                  8193639,8194687 solaris-all,windows-x86
+serviceability/sa/ClhsdbFindPC.java                                                 8193639,8194687 solaris-all,windows-x86
+serviceability/sa/ClhsdbFlags.java                                                  8193639,8194687 solaris-all,windows-x86
+serviceability/sa/ClhsdbInspect.java                                                8193639,8194687 solaris-all,windows-x86
+serviceability/sa/ClhsdbJdis.java                                                   8193639,8194687 solaris-all,windows-x86
+serviceability/sa/ClhsdbJhisto.java                                                 8193639,8194687 solaris-all,windows-x86
+serviceability/sa/ClhsdbJstack.java                                                 8193639,8194687 solaris-all,windows-x86
+serviceability/sa/ClhsdbLongConstant.java                                           8193639,8194687 solaris-all,windows-x86
+serviceability/sa/ClhsdbPmap.java                                                   8193639,8194687 solaris-all,windows-x86
 serviceability/sa/ClhsdbPrintAll.java                                               8193639 solaris-all
-serviceability/sa/ClhsdbPrintAs.java                                                8193639 solaris-all
-serviceability/sa/ClhsdbPrintStatics.java                                           8193639 solaris-all
-serviceability/sa/ClhsdbPstack.java                                                 8193639 solaris-all
+serviceability/sa/ClhsdbPrintAs.java                                                8193639,8194687 solaris-all,windows-x86
+serviceability/sa/ClhsdbPrintStatics.java                                           8193639,8194687 solaris-all,windows-x86
+serviceability/sa/ClhsdbPstack.java                                                 8193639,8194687 solaris-all,windows-x86
 serviceability/sa/ClhsdbRegionDetailsScanOopsForG1.java                             8193639 solaris-all
-serviceability/sa/ClhsdbScanOops.java                                               8193639 solaris-all
-serviceability/sa/ClhsdbSource.java                                                 8193639 solaris-all
-serviceability/sa/ClhsdbSymbol.java                                                 8193639 solaris-all
-serviceability/sa/ClhsdbSymbolTable.java                                            8193639 solaris-all
-serviceability/sa/ClhsdbThread.java                                                 8193639 solaris-all
-serviceability/sa/ClhsdbVmStructsDump.java                                          8193639 solaris-all
-serviceability/sa/ClhsdbWhere.java                                                  8193639 solaris-all
-serviceability/sa/DeadlockDetectionTest.java                                        8193639 solaris-all
-serviceability/sa/JhsdbThreadInfoTest.java                                          8193639 solaris-all
+serviceability/sa/ClhsdbScanOops.java                                               8193639,8194687 solaris-all,windows-x86
+serviceability/sa/ClhsdbSource.java                                                 8193639,8194687 solaris-all,windows-x86
+serviceability/sa/ClhsdbSymbol.java                                                 8193639,8194687 solaris-all,windows-x86
+serviceability/sa/ClhsdbSymbolTable.java                                            8193639,8194687 solaris-all,windows-x86
+serviceability/sa/ClhsdbThread.java                                                 8193639,8194687 solaris-all,windows-x86
+serviceability/sa/ClhsdbVmStructsDump.java                                          8193639,8194687 solaris-all,windows-x86
+serviceability/sa/ClhsdbWhere.java                                                  8193639,8194687 solaris-all,windows-x86
+serviceability/sa/DeadlockDetectionTest.java                                        8193639,8194687 solaris-all,windows-x86
+serviceability/sa/JhsdbThreadInfoTest.java                                          8193639,8194687 solaris-all,windows-x86
 serviceability/sa/sadebugd/SADebugDTest.java                                        8163805 generic-all
-serviceability/sa/TestClassDump.java                                                8193639 solaris-all
-serviceability/sa/TestCpoolForInvokeDynamic.java                                    8193639 solaris-all
-serviceability/sa/TestDefaultMethods.java                                           8193639 solaris-all
-serviceability/sa/TestG1HeapRegion.java                                             8193639 solaris-all
-serviceability/sa/TestHeapDumpForInvokeDynamic.java                                 8193639 solaris-all
-serviceability/sa/TestHeapDumpForLargeArray.java                                    8193639 solaris-all
-serviceability/sa/TestInstanceKlassSizeForInterface.java                            8193639 solaris-all
-serviceability/sa/TestIntConstant.java                                              8193639 solaris-all
-serviceability/sa/TestJhsdbJstackLock.java                                          8193639 solaris-all
-serviceability/sa/TestRevPtrsForInvokeDynamic.java                                  8191270 generic-all
-serviceability/sa/TestType.java                                                     8193639 solaris-all
-serviceability/sa/TestUniverse.java#id0                                             8193639 solaris-all
+serviceability/sa/TestClassDump.java                                                8193639,8194687 solaris-all,windows-x86
+serviceability/sa/TestCpoolForInvokeDynamic.java                                    8193639,8194687 solaris-all,windows-x86
+serviceability/sa/TestDefaultMethods.java                                           8193639,8194687 solaris-all,windows-x86
+serviceability/sa/TestG1HeapRegion.java                                             8193639,8194687 solaris-all,windows-x86
+serviceability/sa/TestHeapDumpForInvokeDynamic.java                                 8193639,8194687 solaris-all,windows-x86
+serviceability/sa/TestHeapDumpForLargeArray.java                                    8193639,8194687 solaris-all,windows-x86
+serviceability/sa/TestInstanceKlassSizeForInterface.java                            8193639,8194687 solaris-all,windows-x86
+serviceability/sa/TestIntConstant.java                                              8193639,8194687 solaris-all,windows-x86
+serviceability/sa/TestJhsdbJstackLock.java                                          8193639,8194687 solaris-all,windows-x86
+serviceability/sa/TestRevPtrsForInvokeDynamic.java                                  8191270,8194687 generic-all
+serviceability/sa/TestType.java                                                     8193639,8194687 solaris-all,windows-x86
+serviceability/sa/TestUniverse.java#id0                                             8193639,8194687 solaris-all,windows-x86
 
 #############################################################################
 
@@ -146,6 +159,9 @@ serviceability/sa/TestUniverse.java#id0
 
 #############################################################################
 
+vmTestbase/nsk/monitoring/GarbageCollectorMXBean/CollectionCounters/CollectionCounters001/CollectionCounters001.java JBR-2062 generic-x86
+vmTestbase/nsk/monitoring/GarbageCollectorMXBean/CollectionCounters/CollectionCounters002/TestDescription.java JBR-2062 generic-x86
+vmTestbase/nsk/monitoring/GarbageCollectorMXBean/CollectionCounters/CollectionCounters003/TestDescription.java JBR-2062 generic-x86
 vmTestbase/nsk/monitoring/MemoryPoolMBean/isCollectionUsageThresholdExceeded/isexceeded003/TestDescription.java 8153598 generic-all
 vmTestbase/nsk/monitoring/MemoryPoolMBean/isUsageThresholdExceeded/isexceeded001/TestDescription.java 8198668 generic-all
 vmTestbase/nsk/monitoring/MemoryPoolMBean/isUsageThresholdExceeded/isexceeded002/TestDescription.java 8153598 generic-all
@@ -205,29 +221,33 @@ vmTestbase/nsk/jvmti/IterateThroughHeap/filter-untagged/TestDescription.java
 
 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
+vmTestbase/gc/lock/jni/jnilock002/TestDescription.java                              8208243,8192647 generic-all
 
-vmTestbase/jit/escape/LockCoarsening/LockCoarsening001/TestDescription.java 8148743 generic-all
-vmTestbase/jit/escape/LockCoarsening/LockCoarsening002/TestDescription.java 8208259 generic-all
+vmTestbase/jit/escape/LockCoarsening/LockCoarsening001/TestDescription.java         8148743 generic-all
+vmTestbase/jit/escape/LockCoarsening/LockCoarsening002/TestDescription.java         8208259 generic-all
 
-vmTestbase/vm/mlvm/indy/func/jvmti/redefineClassInBootstrap/TestDescription.java 8013267 generic-all
-vmTestbase/vm/mlvm/indy/stress/java/relinkMutableCallSite/Test.java 8079664 generic-all
-vmTestbase/vm/mlvm/indy/stress/java/relinkVolatileCallSite/Test.java 8079664 generic-all
-vmTestbase/vm/mlvm/meth/func/java/throwException/Test.java 8208255 generic-all
-vmTestbase/vm/mlvm/meth/func/jdi/breakpointOtherStratum/Test.java 8208257,8208255 generic-all
-vmTestbase/vm/mlvm/meth/stress/compiler/deoptimize/Test.java 8079642,8208255 generic-all
-vmTestbase/vm/mlvm/meth/stress/compiler/i2c_c2i/Test.java 8208255 generic-all
-vmTestbase/vm/mlvm/meth/stress/compiler/sequences/Test.java 8208255 generic-all
-vmTestbase/vm/mlvm/meth/stress/gc/callSequencesDuringGC/Test.java 8208255 generic-all
-vmTestbase/vm/mlvm/meth/stress/java/sequences/Test.java 8208255 generic-all
-vmTestbase/vm/mlvm/meth/stress/jdi/breakpointInCompiledCode/Test.java 8208255 generic-all
-vmTestbase/vm/mlvm/mixed/stress/java/findDeadlock/TestDescription.java 8208278 generic-all
-vmTestbase/vm/mlvm/mixed/stress/regression/b6969574/INDIFY_Test.java 8079650 generic-all
-vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2none_a/TestDescription.java 8013267 generic-all
-vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2manyDiff_b/TestDescription.java 8013267 generic-all
-vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2manySame_b/TestDescription.java 8013267 generic-all
+vmTestbase/vm/mlvm/indy/func/jvmti/redefineClassInBootstrap/TestDescription.java    8013267 generic-all
+vmTestbase/vm/mlvm/indy/stress/java/relinkMutableCallSite/Test.java                 8079664 generic-all
+vmTestbase/vm/mlvm/indy/stress/java/relinkVolatileCallSite/Test.java                8079664 generic-all
+vmTestbase/vm/mlvm/cp/stress/classfmt/correctBootstrap/TestDescription.java         8231169 linux-aarch64
+vmTestbase/vm/mlvm/cp/stress/classfmt/mh/TestDescription.java                       8231169 linux-aarch64
+vmTestbase/vm/mlvm/meth/stress/gc/createLotsOfMHConsts/Test.java                    8231169 linux-aarch64
+vmTestbase/vm/mlvm/meth/func/java/throwException/Test.java                          8208255 generic-all
+vmTestbase/vm/mlvm/meth/func/jdi/breakpointOtherStratum/Test.java                   8208257,8208255 generic-all
+vmTestbase/vm/mlvm/meth/stress/compiler/deoptimize/Test.java                        8079642,8208255 generic-all
+vmTestbase/vm/mlvm/meth/stress/compiler/i2c_c2i/Test.java                           8208255 generic-all
+vmTestbase/vm/mlvm/meth/stress/compiler/sequences/Test.java                         8208255 generic-all
+vmTestbase/vm/mlvm/meth/stress/gc/callSequencesDuringGC/Test.java                   8208255 generic-all
+vmTestbase/vm/mlvm/meth/stress/java/sequences/Test.java                             8208255 generic-all
+vmTestbase/vm/mlvm/meth/stress/jdi/breakpointInCompiledCode/Test.java               8208255 generic-all
+vmTestbase/vm/mlvm/mixed/stress/java/findDeadlock/TestDescription.java              8208278 generic-all
+vmTestbase/vm/mlvm/mixed/stress/regression/b6969574/INDIFY_Test.java                8079650 generic-all
+vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2none_a/TestDescription.java         8013267 generic-all
+vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2manyDiff_b/TestDescription.java     8013267 generic-all
+vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2manySame_b/TestDescription.java     8013267 generic-all
 
-vmTestbase/nsk/jdb/exclude/exclude001/exclude001.java 8197938 windows-all
+vmTestbase/nsk/jdb/exclude/exclude001/exclude001.java                               8197938 windows-all
+vmTestbase/nsk/jdb/unwatch/unwatch002/unwatch002.java.unwatch002                    8208471 windows-all
 
 vmTestbase/nsk/jdwp/ThreadReference/ForceEarlyReturn/forceEarlyReturn001/forceEarlyReturn001.java 7199837 generic-all
 

test/jdk/java/awt/FileDialog/MacOSGoToFolderCrash.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.EventQueue;
+import java.awt.FileDialog;
+import java.awt.Frame;
+import java.awt.Robot;
+import java.awt.event.KeyEvent;
+
+/**
+ * @test
+ * @key headful
+ * @bug 8234522
+ * @requires (os.family == "mac")
+ */
+public final class MacOSGoToFolderCrash {
+
+    public static void main(final String[] args) throws Exception {
+        EventQueue.invokeLater(() -> {
+            FileDialog fd = new FileDialog((Frame) null);
+            fd.setVisible(true);
+        });
+        Robot robot = new Robot();
+        robot.setAutoDelay(400);
+        robot.waitForIdle();
+        // "⌘+Shift+G" – Open "Go To Folder" window
+        robot.keyPress(KeyEvent.VK_META);
+        robot.keyPress(KeyEvent.VK_SHIFT);
+        robot.keyPress(KeyEvent.VK_G);
+        robot.keyRelease(KeyEvent.VK_G);
+        robot.keyRelease(KeyEvent.VK_SHIFT);
+        robot.keyRelease(KeyEvent.VK_META);
+        // Select something
+        robot.keyPress(KeyEvent.VK_DOWN);
+        robot.keyRelease(KeyEvent.VK_DOWN);
+        robot.keyPress(KeyEvent.VK_ENTER);
+        robot.keyRelease(KeyEvent.VK_ENTER);
+        // Close File dialog
+        robot.keyPress(KeyEvent.VK_ESCAPE);
+        robot.keyRelease(KeyEvent.VK_ESCAPE);
+    }
+}

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

@@ -0,0 +1,62 @@
+/*
+ * Copyright 2000-2019 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.KeyEvent;
+
+public class KeyboardLayoutSwitchTest implements Runnable {
+
+    private static Robot robot;
+    private JFrame frame;
+
+    public static void main(String[] args) throws Exception {
+
+        System.out.println("VK_TAB = " + KeyEvent.VK_TAB);
+        robot = new Robot();
+        robot.setAutoDelay(50);
+
+        KeyboardLayoutSwitchTest test = new KeyboardLayoutSwitchTest();
+        SwingUtilities.invokeAndWait(test);
+        robot.delay(3000);
+
+        try {
+            SwingUtilities.invokeAndWait(() ->
+                    pressCtrlKey(KeyEvent.VK_TAB));
+        } finally {
+            SwingUtilities.invokeAndWait(() -> test.frame.dispose());
+            robot.delay(2000);
+        }
+        System.out.println("Test PASSED");
+    }
+
+    private static void pressCtrlKey(int vk) {
+        robot.keyPress(KeyEvent.VK_CONTROL);
+        robot.keyPress(vk);
+        robot.keyRelease(vk);
+        robot.keyRelease(KeyEvent.VK_CONTROL);
+    }
+
+    @Override
+    public void run() {
+        frame = new JFrame(getClass().getSimpleName());
+        frame.pack();
+        frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
+        frame.toFront();
+    }
+}

test/jdk/jb/sun/awt/macos/KeyboardLayoutSwitchTest/KeyboardLayoutSwitchTest.sh

@@ -0,0 +1,71 @@
+#!/bin/bash
+
+#
+# Copyright 2000-2019 JetBrains s.r.o.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# @test
+# @summary KeyboardLayoutSwitchTest.sh checks memory leaks
+# @run shell KeyboardLayoutSwitchTest.sh
+
+OS=`uname -s`
+case "$OS" in
+  Darwin)
+    echo "Detected OS $OS"
+    ;;
+  * )
+    echo "PASSED: The test is valid for MacOSX"
+    exit 0;
+    ;;
+esac
+
+if [ -z "${TESTSRC}" ]; then
+  echo "TESTSRC undefined: set to ."
+  TESTSRC=.
+fi
+
+if [ -z "${TESTCLASSES}" ]; then
+  echo "TESTCLASSES undefined: set to ."
+  TESTCLASSES=.
+fi
+
+if [ -z "${TESTJAVA}" ]; then
+  echo "TESTJAVA undefined: testing cancelled"
+  exit 1
+fi
+
+cd ${TESTSRC}
+//${TESTJAVA}/bin/javac -d ${TESTCLASSES} AppleSymbolicHotKeysReader.java
+${TESTJAVA}/bin/javac -d ${TESTCLASSES} KeyboardLayoutSwitchTest.java
+
+echo "reading current hot keys"
+oldKeyValue=$(defaults read "com.apple.symbolichotkeys" | grep -A10  " 60 =" | sed '$d' | sed '1d' | tr -d '\r\n' | tr -s ' ' | sed s/standard/\'standard\'/)
+
+defaults write com.apple.symbolichotkeys AppleSymbolicHotKeys -dict-add 60 "{ enabled = 1; value = { parameters = ( 65535, 48, 262144 ); type = 'standard'; };}"
+${TESTJAVA}/bin/java -cp ${TESTCLASSES} KeyboardLayoutSwitchTest
+exit_code=$?
+defaults write com.apple.symbolichotkeys AppleSymbolicHotKeys -dict-add 60 "$oldKeyValue"
+
+case $exit_code in
+0) echo "PASSED"
+   ;;
+*) echo "FAILED"
+   exit 1
+   ;;
+esac
+exit 0
+
+
+

test/jdk/jbProblemList.txt

@@ -137,7 +137,7 @@ java/awt/Component/SetEnabledPerformance/SetEnabledPerformance.java
 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/Dialog/NestedDialogs/Modeless/NestedModelessDialogTest.java                8225790 linux-all
+java/awt/Dialog/NestedDialogs/Modeless/NestedModelessDialogTest.java                8225790 linux-all,windows-x86
 java/awt/Dialog/SiblingChildOrder/SiblingChildOrderTest.java                        8215105,8221383 macosx-all,windows-all
 java/awt/EmbeddedFrame/EmbeddedFrameGrabTest/EmbeddedFrameGrabTest.java             8159069 windows-all
 java/awt/EventDispatchThread/HandleExceptionOnEDT/HandleExceptionOnEDT.java         8203047 macosx-all,linux-all,windows-all
@@ -197,6 +197,7 @@ java/awt/Focus/WrongKeyTypedConsumedTest/WrongKeyTypedConsumedTest.java
 java/awt/FontMetrics/FontCrash.java                                                 8198336 windows-all
 java/awt/FontMetrics/MaxAdvanceIsMax.java                                           8221304 solaris-all,macosx-all
 java/awt/Frame/DisposeParentGC/DisposeParentGC.java                                 8079786,8055833 macosx-all,linux-all
+java/awt/Frame/DisposeStressTest/DisposeStressTest.html                             JBR-1905 macosx-all
 java/awt/Frame/ExceptionOnSetExtendedStateTest/ExceptionOnSetExtendedStateTest.java 8198237 macosx-all
 java/awt/Frame/FramesGC/FramesGC.java                                               8079069 macosx-all
 java/awt/Frame/FrameLocation/FrameLocation.java                                     8019803 macosx-all
@@ -206,6 +207,7 @@ java/awt/Frame/MaximizedUndecorated/MaximizedUndecorated.java
 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,windows-all
+java/awt/Frame/ShownOffScreenOnWin98/ShownOffScreenOnWin98Test.java                 8214505 linux-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
@@ -282,7 +284,7 @@ java/awt/Mixing/AWT_Mixing/MixingPanelsResizing.java
 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/MixingOnDialog.java                                                 7124549,8225777 macosx-all,windows-all,linux-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,8169457 macosx-all,windows-all,linux-all
@@ -568,6 +570,7 @@ java/awt/TextArea/AutoScrollOnSelectAndAppend/AutoScrollOnSelectAndAppend.java
 java/awt/TextArea/DisposeTest/TestDispose.java                                      JBR-1905 generic-all
 java/awt/TextArea/TextAreaScrolling/TextAreaScrolling.java                          8196300 windows-all
 java/awt/TextField/SelectionInvisibleTest/SelectionInvisibleTest.java               8169533 macosx-all,windows-all
+java/awt/TextField/DisposeTest/TestDispose.java                                     JBR-1905 macosx-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 generic-all
@@ -591,7 +594,7 @@ java/awt/Window/8159168/SetShapeTest.java
 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,8194941 macosx-all,windows-all,linux-all
-java/awt/Window/MultiWindowApp/MultiWindowAppTest.java                              8159904 macosx-all,windows-all
+java/awt/Window/MultiWindowApp/MultiWindowAppTest.java                              8159904 macosx-all,windows-all,linux-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)
@@ -620,12 +623,13 @@ java/awt/dnd/DisposeFrameOnDragCrash/DisposeFrameOnDragTest.java
 java/awt/dnd/DragInterceptorAppletTest/DragInterceptorAppletTest.html               8215538 windows-all,macosx-all,linux-all (macosx-all,linux-all: commit)
 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/FileListBetweenJVMsTest/FileListBetweenJVMsTest.html                   7124379,7188825 macosx-all,linux-all,windows-all
 java/awt/dnd/ImageTransferTest/ImageTransferTest.java                               8176556 generic-all
-java/awt/dnd/InterJVMGetDropSuccessTest/InterJVMGetDropSuccessTest.html
+java/awt/dnd/InterJVMGetDropSuccessTest/InterJVMGetDropSuccessTest.html             8208555 windows-all
 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,linux-all,macosx-all
-java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.html                     8171510 macosx-all
+java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.html                     8171510,7124379 macosx-all,linux-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
@@ -659,7 +663,7 @@ java/awt/font/TextLayout/OSXLigatureTest.java
 java/awt/font/TextLayout/TextLayoutBounds.java                                      8169188 generic-all
 java/awt/grab/EmbeddedFrameTest1/EmbeddedFrameTest1.java                            7080150 macosx-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/im/memoryleak/InputContextMemoryLeakTest.java                              8023814 linux-all,macosx-all,solaris-all
 java/awt/image/DrawImage/IncorrectAlphaSurface2SW.java                              8056077 generic-all
 java/awt/image/DrawImage/IncorrectBounds.java                                       8169473 windows-all
 java/awt/image/DrawImage/IncorrectClipXorModeSW2Surface.java                        8196025 windows-all
@@ -714,6 +718,7 @@ java/beans/XMLEncoder/Test6570354.java
 
 # jdk_lang
 
+java/lang/String/StringRepeat.java                                                  8221400 generic-x86
 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
@@ -760,6 +765,7 @@ javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java
 
 # jdk_net
 
+java/net/CookieHandler/B6791927.java                                                8234007 generic-all
 java/net/MulticastSocket/NoLoopbackPackets.java                                     7122846 macosx-all
 java/net/MulticastSocket/SetLoopbackMode.java                                       7122846 macosx-all
 java/net/MulticastSocket/Test.java                                                  7145658,8207404 macosx-all,aix-all
@@ -770,6 +776,8 @@ java/net/DatagramSocket/SendDatagramToBadAddress.java
 java/net/httpclient/ProxyAuthDisabledSchemesSSL.java                                8212695 macosx-all
 java/net/httpclient/UnknownBodyLengthTest.java                                      8210130 macosx-all,windows-all
 
+javax/net/ssl/SSLSocket/Tls13PacketSize.java                                        8224829 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
 
@@ -946,7 +954,7 @@ javax/swing/JSplitPane/4201995/bug4201995.java
 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
+javax/swing/JTabbedPane/7024235/Test7024235.java                                    8028281,JBR-1977 macosx-all,linux-aarch64
 javax/swing/JTabbedPane/8007563/Test8007563.java                                    8051591 generic-all
 javax/swing/JTable/4235420/bug4235420.java                                          8079127 generic-all
 javax/swing/JTable/6263446/bug6263446.java                                          8169959 macosx-all,windows-all
@@ -970,7 +978,7 @@ javax/swing/JTree/8003830/bug8003830.java
 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,linux-all,windows-all
-javax/swing/JWindow/ShapedAndTranslucentWindows/ShapedPerPixelTranslucentGradient.java 8198667 macosx-all
+javax/swing/JWindow/ShapedAndTranslucentWindows/ShapedPerPixelTranslucentGradient.java 8198667,8224876 macosx-all,linux-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,windows-all
@@ -1042,6 +1050,7 @@ javax/swing/tree/DefaultTreeCellRenderer/6225504/bug6225504.java
 javax/swing/tree/DefaultTreeCellRenderer/7142955/bug7142955.java                    8199076 generic-all
 
 sanity/client/SwingSet/src/ButtonDemoScreenshotTest.java                            8198920 macosx-all,linux-all,windows-all
+sanity/client/SwingSet/src/GridBagLayoutDemoTest.java.GridBagLayoutDemoTest         8210302 linux-all
 
 ############################################################################
 
@@ -1073,6 +1082,52 @@ com/sun/jdi/RepStep.java
 com/sun/jdi/GetLocalVariables4Test.sh                                               8067354 windows-all
 com/sun/jdi/sde/SourceDebugExtensionTest.java                                       8158066 windows-all
 com/sun/jdi/NashornPopFrameTest.java                                                8187143 generic-all
+com/sun/jdi/ArrayLengthDumpTest.sh                                                  8201652 windows-all
+com/sun/jdi/BreakpointWithFullGC.sh                                                 8201652 windows-all
+com/sun/jdi/CatchAllTest.sh                                                         8201652 windows-all
+com/sun/jdi/CatchCaughtTest.sh                                                      8201652 windows-all
+com/sun/jdi/CatchPatternTest.sh                                                     8201652 windows-all
+com/sun/jdi/CommandCommentDelimiter.sh                                              8201652 windows-all
+com/sun/jdi/DeferredStepTest.sh                                                     8201652 windows-all
+com/sun/jdi/DeoptimizeWalk.sh                                                       8201652 windows-all
+com/sun/jdi/EvalArgs.sh                                                             8201652 windows-all
+com/sun/jdi/EvalArraysAsList.sh                                                     8201652 windows-all
+com/sun/jdi/EvalInterfaceStatic.sh                                                  8201652 windows-all
+com/sun/jdi/GetLocalVariables3Test.sh                                               8201652 windows-all
+com/sun/jdi/GetLocalVariables4Test.sh                                               8201652 windows-all
+com/sun/jdi/ImmutableResourceTest.sh                                                8201652 windows-all
+com/sun/jdi/JdbArgTest.sh                                                           8201652 windows-all
+com/sun/jdi/JdbExprTest.sh                                                          8201652 windows-all
+com/sun/jdi/JdbLockTest.sh                                                          8201652 windows-all
+com/sun/jdi/JdbMethodExitTest.sh                                                    8201652 windows-all
+com/sun/jdi/JdbMissStep.sh                                                          8201652 windows-all
+com/sun/jdi/JdbReadTwiceTest.sh                                                     8201652 windows-all
+com/sun/jdi/JdbVarargsTest.sh                                                       8201652 windows-all
+com/sun/jdi/JITDebug.sh                                                             8201652 windows-all
+com/sun/jdi/MixedSuspendTest.sh                                                     8201652 windows-all
+com/sun/jdi/NotAField.sh                                                            8201652 windows-all
+com/sun/jdi/NullLocalVariable.sh                                                    8201652 windows-all
+com/sun/jdi/PrivateTransportTest.sh                                                 8201652 windows-all
+com/sun/jdi/redefine/RedefineTest.java                                              8201652 windows-all
+com/sun/jdi/Redefine-g.sh                                                           8201652 windows-all
+com/sun/jdi/RedefineAbstractClass.sh                                                8201652 windows-all
+com/sun/jdi/RedefineAddPrivateMethod.sh                                             8201652 windows-all
+com/sun/jdi/RedefineAnnotation.sh                                                   8201652 windows-all
+com/sun/jdi/RedefineChangeClassOrder.sh                                             8201652 windows-all
+com/sun/jdi/RedefineClasses.sh                                                      8201652 windows-all
+com/sun/jdi/RedefineClearBreakpoint.sh                                              8201652 windows-all
+com/sun/jdi/RedefineException.sh                                                    8201652 windows-all
+com/sun/jdi/RedefineFinal.sh                                                        8201652 windows-all
+com/sun/jdi/RedefineImplementor.sh                                                  8201652 windows-all
+com/sun/jdi/RedefineIntConstantToLong.sh                                            8201652 windows-all
+com/sun/jdi/redefineMethod/RedefineTest.java                                        8201652 windows-all
+com/sun/jdi/RedefineMulti.sh                                                        8201652 windows-all
+com/sun/jdi/RedefinePop.sh                                                          8201652 windows-all
+com/sun/jdi/RedefineStep.sh                                                         8201652 windows-all
+com/sun/jdi/RedefineTTYLineNumber.sh                                                8201652 windows-all
+com/sun/jdi/StringConvertTest.sh                                                    8201652 windows-all
+com/sun/jdi/WatchFramePop.sh                                                        8201652 windows-all
+com/sun/jdi/ZZZcleanup.sh                                                           8201652 windows-all
 
 ############################################################################
 
@@ -1168,3 +1223,26 @@ tools/jlink/plugins/IncludeLocalesPluginTest.java
 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
+
+# aarch64: GTK look and feel - not supported
+java/awt/Component/DimensionEncapsulation/DimensionEncapsulation.java               JBR-1977 linux-aarch64
+java/awt/Component/InsetsEncapsulation/InsetsEncapsulation.java                     JBR-1977 linux-aarch64
+javax/swing/JColorChooser/Test6707406.java                                          JBR-1977 linux-aarch64
+javax/swing/JFileChooser/8013442/Test8013442.java                                   JBR-1977 linux-aarch64
+javax/swing/JInternalFrame/4769772/TestJInternalFrameIconify.java                   JBR-1977 linux-aarch64
+javax/swing/JInternalFrame/8075314/bug8075314.java                                  JBR-1977 linux-aarch64
+javax/swing/JInternalFrame/NormalBoundsTest.java                                    JBR-1977 linux-aarch64
+javax/swing/JList/BasicListTest.java                                                JBR-1977 linux-aarch64
+javax/swing/JList/ListSelectionModelTest.java                                       JBR-1977 linux-aarch64
+javax/swing/JMenuBar/MisplacedBorder/MisplacedBorder.java                           JBR-1977 linux-aarch64
+javax/swing/JMenuItem/8158566/CloseOnMouseClickPropertyTest.java                    JBR-1977 linux-aarch64
+javax/swing/JRootPane/SilenceOfDeprecatedMenuBar/SilenceOfDeprecatedMenuBar.java    JBR-1977 linux-aarch64
+javax/swing/JScrollBar/7163696/Test7163696.java                                     JBR-1977 linux-aarch64
+javax/swing/JSlider/6794831/bug6794831.java                                         JBR-1977 linux-aarch64
+javax/swing/JSpinner/WrongEditorTextFieldFont/FontByDefault.java                    JBR-1977 linux-aarch64
+javax/swing/JSpinner/WrongEditorTextFieldFont/FontSetByUser.java                    JBR-1977 linux-aarch64
+javax/swing/JSpinner/WrongEditorTextFieldFont/FontSetToNull.java                    JBR-1977 linux-aarch64
+javax/swing/JTextArea/4697612/bug4697612.java                                       JBR-1977 linux-aarch64
+javax/swing/LookAndFeel/8145547/DemandGTK.java                                      JBR-1977 linux-aarch64
+javax/swing/LookAndFeel/8146276/NimbusGlueTest.java                                 JBR-1977 linux-aarch64
+sanity/client/SwingSet/src/GridBagLayoutDemoTest.java                               JBR-1977 linux-aarch64

test/jdk/jbcommitProblemList.txt

@@ -52,7 +52,7 @@ java/awt/KeyboardFocusmanager/TypeAhead/EnqueueWithDialogTest/EnqueueWithDialogT
 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/ActionEventTest/ActionEventTest.java                                          nobug generic-all timeout
 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
@@ -104,6 +104,7 @@ java/awt/Window/SetWindowLocationByPlatformTest/SetWindowLocationByPlatformTest.
 java/awt/Window/ShapedAndTranslucentWindows/Translucent.java                                nobug windows-all,macosx-all
 java/awt/Window/ShapedAndTranslucentWindows/WindowOpacity.java                              nobug windows-all
 java/awt/Window/TopLevelLocation/TopLevelLocation.java                                      nobug linux-all,macosx-all
+java/awt/Window/WindowDeadlockTest/WindowDeadlockTest.java                                  nobug macosx-all timeout
 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
@@ -111,11 +112,9 @@ java/awt/datatransfer/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.html
 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/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,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,linux-all
 java/awt/event/KeyEvent/DeadKey/DeadKeyMacOSXInputText.java                                 nobug macosx-all
 java/awt/event/KeyEvent/DeadKey/deadKeyMacOSX.java                                          nobug macosx-all
@@ -132,7 +131,6 @@ java/awt/event/MouseWheelEvent/DisabledComponent/DisabledComponent.java
 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/MenuDragEvents/MenuDragEvents.java                                            nobug macosx-all,windows-all
 java/awt/hidpi/ClientAreaOriginWindowsTest.java                                             nobug windows-all
@@ -184,7 +182,7 @@ javax/swing/JPopupMenu/6827786/bug6827786.java
 javax/swing/JProgressBar/8015748/JProgressBarOrientationRobotTest.java                      nobug macosx-all,windows-all
 javax/swing/JRadioButton/8041561/bug8041561.java                                            nobug windows-all
 javax/swing/JScrollBar/7163696/Test7163696.java                                             nobug windows-all
-javax/swing/JScrollBar/bug4202954/bug4202954.java                                           nobug windows-all
+javax/swing/JScrollBar/bug4202954/bug4202954.java                                           nobug generic-all timeout
 javax/swing/JSlider/6401380/bug6401380.java                                                 nobug windows-all
 javax/swing/JTabbedPane/7161568/bug7161568.java                                             nobug windows-all,linux-all
 javax/swing/JTabbedPane/7170310/bug7170310.java                                             nobug macosx-all,linux-all