Revert "JBR-4363 Changes in fonts rendering between JBR11 and JBR17"

This reverts commit bfa7a36237.

jb/project/tools/common/scripts/common.sh

@@ -31,7 +31,7 @@ architecture=$3 # aarch64 or x64
 bundle_type=$(do_maketest)
 do_maketest=$?
 tag_prefix="jbr-"
-OPENJDK_TAG=$(git log --simplify-by-decoration --decorate=short --pretty=short | grep "$tag_prefix" | cut -d "(" -f2 | cut -d ")" -f1 | awk '{print $2}' | sort -t "-" -k 2 -g | tail -n 1)
+OPENJDK_TAG=$(git log --simplify-by-decoration --decorate=short --pretty=short | grep "$tag_prefix" | cut -d "(" -f2 | cut -d ")" -f1 | awk '{print $2}' | sort -t "-" -k 2 -g | tail -n 1 | tr -d ",")
 VERSION_FEATURE=$(getVersionProp "DEFAULT_VERSION_FEATURE")
 VERSION_INTERIM=$(getVersionProp "DEFAULT_VERSION_INTERIM")
 VERSION_UPDATE=$(getVersionProp "DEFAULT_VERSION_UPDATE")

src/hotspot/share/classfile/classLoaderData.cpp

@@ -335,16 +335,6 @@ void ClassLoaderData::classes_do(KlassClosure* klass_closure) {
   }
 }
 
-void ClassLoaderData::initialized_classes_do(KlassClosure* klass_closure) {
-  // Lock-free access requires load_acquire
-  for (Klass* k = Atomic::load_acquire(&_klasses); k != NULL; k = k->next_link()) {
-    if (k->is_instance_klass() && InstanceKlass::cast(k)->is_initialized()) {
-      klass_closure->do_klass(k);
-    }
-    assert(k != k->next_link(), "no loops!");
-  }
-}
-
 void ClassLoaderData::classes_do(void f(Klass * const)) {
   // Lock-free access requires load_acquire
   for (Klass* k = Atomic::load_acquire(&_klasses); k != NULL; k = k->next_link()) {

src/hotspot/share/classfile/classLoaderData.hpp

@@ -272,7 +272,6 @@ class ClassLoaderData : public CHeapObj<mtClass> {
   void oops_do(OopClosure* f, int claim_value, bool clear_modified_oops = false);
 
   void classes_do(KlassClosure* klass_closure);
-  void initialized_classes_do(KlassClosure* klass_closure);
   Klass* klasses() { return _klasses; }
 
   JNIMethodBlock* jmethod_ids() const              { return _jmethod_ids; }

src/hotspot/share/classfile/classLoaderDataGraph.cpp

@@ -361,13 +361,6 @@ void ClassLoaderDataGraph::classes_do(KlassClosure* klass_closure) {
   }
 }
 
-void ClassLoaderDataGraph::initialized_classes_do(KlassClosure* klass_closure) {
-  ClassLoaderDataGraphIterator iter;
-  while (ClassLoaderData* cld = iter.get_next()) {
-    cld->initialized_classes_do(klass_closure);
-  }
-}
-
 void ClassLoaderDataGraph::classes_do(void f(Klass* const)) {
   ClassLoaderDataGraphIterator iter;
   while (ClassLoaderData* cld = iter.get_next()) {

src/hotspot/share/classfile/classLoaderDataGraph.hpp

@@ -79,9 +79,6 @@ class ClassLoaderDataGraph : public AllStatic {
   // Walking the ClassLoaderDataGraph also includes hidden classes.
   static void classes_do(KlassClosure* klass_closure);
 
-  // Enhanced class redefinition
-  static void initialized_classes_do(KlassClosure* klass_closure);
-
   static void classes_do(void f(Klass* const));
   static void methods_do(void f(Method*));
   static void modules_do(void f(ModuleEntry*));

src/hotspot/share/jfr/recorder/jfrRecorder.cpp

@@ -68,6 +68,7 @@ static bool enable() {
   }
   _enabled = FlightRecorder;
   assert(_enabled, "invariant");
+  AllowEnhancedClassRedefinition = false;
   return _enabled;
 }
 

src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp

@@ -2129,6 +2129,11 @@ class AffectedKlassClosure : public KlassClosure {
   void do_klass(Klass* klass) {
     assert(!_affected_klasses->contains(klass), "must not occur more than once!");
 
+    // allow only loaded classes
+    if (!klass->is_instance_klass() || !InstanceKlass::cast(klass)->is_loaded()) {
+      return;
+    }
+
     if (klass->new_version() != NULL) {
       return;
     }
@@ -2185,12 +2190,8 @@ jvmtiError VM_EnhancedRedefineClasses::find_sorted_affected_classes(TRAPS) {
   {
     MutexLocker mcld(ClassLoaderDataGraph_lock);
 
-    // We can't use ClassLoaderDataGraph::classes_do since classes can be uninitialized in cld,
-    // fully initialized class is in system dictionary, but hidden classes are excluded. Therefore
-    // we use special method iterating over initialized classes only
-    // ClassLoaderDataGraph::classes_do(&closure);
-
-    ClassLoaderDataGraph::initialized_classes_do(&closure);
+    // Hidden classes are not in SystemDictionary, so we have to iterate ClassLoaderDataGraph
+    ClassLoaderDataGraph::classes_do(&closure);
   }
 
   log_trace(redefine, class, load)("%d classes affected", _affected_klasses->length());

src/hotspot/share/runtime/arguments.cpp

@@ -4036,7 +4036,7 @@ jint Arguments::parse(const JavaVMInitArgs* initial_cmd_args) {
 
 #if INCLUDE_JFR
   if (FlightRecorder) {
-    if (AllowEnhancedClassRedefinition) {
+    if (AllowEnhancedClassRedefinition || StartFlightRecording != NULL) {
       warning("EnhancedClassRedefinition was disabled, it is not allowed in FlightRecorder.");
       AllowEnhancedClassRedefinition = false;
     }

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

@@ -306,19 +306,24 @@ public class AWTThreading {
 
         @Override
         public void dispatch() {
-            completeIfNotYet(super::dispatch);
-            futureResult.complete(null);
+            // Should not complete if competion has already started.
+            if (completeIfNotYet(super::dispatch)) {
+                futureResult.complete(null);
+            }
         }
 
         public void dispose(String reason) {
             completeIfNotYet(() -> AWTAccessor.getInvocationEventAccessor().dispose(this));
+            // Should complete exceptionally regardless of whether completetion has alredy started or hasn't.
             futureResult.completeExceptionally(new Throwable(reason));
         }
 
-        private void completeIfNotYet(Runnable competeRunnable) {
+        private boolean completeIfNotYet(Runnable competeRunnable) {
             if (!isCompletionStarted.getAndSet(true)) {
                 competeRunnable.run();
+                return true;
             }
+            return false;
         }
 
         /**

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

@@ -351,10 +351,26 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE {
         jreFamilyMap.put("Roboto-Light", "Roboto Light");
         jreFamilyMap.put("Roboto-Thin", "Roboto Thin");
 
-        jreFontMap.put("JetBrainsMono-Bold.ttf", new BundledFontInfo("JetBrainsMono-Bold", 1, 0, 2));
-        jreFontMap.put("JetBrainsMono-Regular.ttf", new BundledFontInfo("JetBrainsMono-Regular", 1, 0, 2));
-        jreFontMap.put("JetBrainsMono-Italic.ttf", new BundledFontInfo("JetBrainsMono-Italic", 1, 0, 2));
-        jreFontMap.put("JetBrainsMono-Bold-Italic.ttf", new BundledFontInfo("JetBrainsMono-BoldItalic", 1, 0, 2));
+        jreFontMap.put("JetBrainsMono-Bold.ttf", new BundledFontInfo("JetBrainsMono-Bold", 2, 225, 0));
+        jreFontMap.put("JetBrainsMono-Bold-Italic.ttf", new BundledFontInfo("JetBrainsMono-Bold-Italic", 2, 225, 0));
+        jreFontMap.put("JetBrainsMono-BoldItalic.ttf", new BundledFontInfo("JetBrainsMono-BoldItalic", 2, 225, 0));
+        jreFontMap.put("JetBrainsMono-ExtraBold.ttf", new BundledFontInfo("JetBrainsMono-ExtraBold", 2, 225, 0));
+        jreFontMap.put("JetBrainsMono-ExtraBoldItalic.ttf", new BundledFontInfo("JetBrainsMono-ExtraBoldItalic", 2, 225, 0));
+        jreFontMap.put("JetBrainsMono-ExtraLight.ttf", new BundledFontInfo("JetBrainsMono-ExtraLight", 2, 225, 0));
+        jreFontMap.put("JetBrainsMono-ExtraLightItalic.ttf", new BundledFontInfo("JetBrainsMono-ExtraLightItalic", 2, 225, 0));
+        jreFontMap.put("JetBrainsMono-Italic.ttf", new BundledFontInfo("JetBrainsMono-Italic", 2, 225, 0));
+        jreFontMap.put("JetBrainsMono-Light.ttf", new BundledFontInfo("JetBrainsMono-Light", 2, 225, 0));
+        jreFontMap.put("JetBrainsMono-LightItalic.ttf", new BundledFontInfo("JetBrainsMono-LightItalic", 2, 225, 0));
+        jreFontMap.put("JetBrainsMono-Medium.ttf", new BundledFontInfo("JetBrainsMono-Medium", 2, 225, 0));
+        jreFontMap.put("JetBrainsMono-MediumItalic.ttf", new BundledFontInfo("JetBrainsMono-MediumItalic", 2, 225, 0));
+        jreFontMap.put("JetBrainsMono-Regular.ttf", new BundledFontInfo("JetBrainsMono-Regular", 2, 225, 0));
+        jreFontMap.put("JetBrainsMono-Thin.ttf", new BundledFontInfo("JetBrainsMono-Thin", 2, 225, 0));
+        jreFontMap.put("JetBrainsMono-ThinItalic.ttf", new BundledFontInfo("JetBrainsMono-ThinItalic", 2, 225, 0));
+
+        jreFontMap.put("Inter-Bold.otf", new BundledFontInfo("Inter-Bold", 3, 19, 0));
+        jreFontMap.put("Inter-Regular.otf", new BundledFontInfo("Inter-Regular", 3, 19, 0));
+        jreFontMap.put("Inter-Italic.otf", new BundledFontInfo("Inter-Italic", 3, 19, 0));
+        jreFontMap.put("Inter-BoldItalic.otf", new BundledFontInfo("Inter-BoldItalic", 3, 19, 0));
 
         jreBundledFontFiles.addAll(jreFontMap.keySet());
     }

src/java.desktop/share/fonts/Inter_LICENSE.txt

@@ -0,0 +1,94 @@
+Copyright (c) 2016-2020 The Inter Project Authors.
+"Inter" is trademark of Rasmus Andersson.
+https://github.com/rsms/inter
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION AND CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

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

@@ -1818,8 +1818,13 @@ class XWindowPeer extends XPanelPeer implements WindowPeer,
     }
 
     private static boolean screenOrDesktopDiffers(XWindowPeer p1, XWindowPeer p2) {
-        return p1.getScreenNumber() != p2.getScreenNumber() ||
-                ENABLE_DESKTOP_CHECK && !Objects.equals(p1.getDesktopId(), p2.getDesktopId());
+        if (p1.getScreenNumber() != p2.getScreenNumber()) return true;
+        if (!ENABLE_DESKTOP_CHECK) return false;
+        Long d1 = p1.getDesktopId();
+        if (d1 == null) return false;
+        Long d2 = p2.getDesktopId();
+        if (d2 == null) return false;
+        return !d1.equals(d2);
     }
 
     /*

test/jdk/jb/java/awt/Toolkit/AWTThreadingTest.java

@@ -5,6 +5,7 @@ import java.util.Arrays;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Consumer;
 import java.util.function.Supplier;
 
 import sun.lwawt.macosx.CThreading;
@@ -38,18 +39,24 @@ public class AWTThreadingTest {
 
         testCase().
             withCaption("certain threads superposition").
-            withRunnable(AWTThreadingTest::test, false).
+            withRunnable(AWTThreadingTest::test1, false).
             run();
 
         testCase().
             withCaption("random threads superposition").
-            withRunnable(AWTThreadingTest::test, false).
+            withRunnable(AWTThreadingTest::test1, false).
+            run();
+
+        testCase().
+            withCaption("JBR-4362").
+            withRunnable(AWTThreadingTest::test2, false).
+            withCompletionTimeout(3).
             run();
 
         System.out.println("Test PASSED");
     }
 
-    static void test() {
+    static void test1() {
         ITER_COUNTER.set(0);
 
         var timer = new TestTimer(TIMEOUT_SECONDS * 3, TimeUnit.SECONDS);
@@ -124,6 +131,53 @@ public class AWTThreadingTest {
         THREAD.start();
     }
 
+    static void test2() {
+        var invocations = new CountDownLatch(1);
+        var invokeAndWaitCompleted = new AtomicBoolean(false);
+
+        var log = new Consumer<String>() {
+            public void accept(String msg) {
+                System.out.println(msg);
+                System.out.flush();
+            }
+        };
+
+        CThreading.executeOnAppKit(() -> {
+            log.accept("executeOnAppKit - entered");
+
+            //
+            // It's expected that LWCToolkit.invokeAndWait() does not exit before its invocation completes.
+            //
+            tryRun(() -> LWCToolkit.invokeAndWait(() -> {
+                log.accept("\tinvokeAndWait - entered");
+
+                AWTThreading.executeWaitToolkit(() -> {
+                    log.accept("\t\texecuteWaitToolkit - entered");
+
+                    LWCToolkit.performOnMainThreadAndWait(() -> log.accept("\t\t\tperformOnMainThreadAndWait - entered"));
+
+                    log.accept("\t\t\tperformOnMainThreadAndWait - exited");
+                });
+
+                invokeAndWaitCompleted.set(true);
+                log.accept("\t\texecuteWaitToolkit - exited");
+            }, FRAME));
+
+            log.accept("\tinvokeAndWait - exited");
+
+            if (!invokeAndWaitCompleted.get()) {
+                TEST_CASE_RESULT.completeExceptionally(new Throwable("Premature exit from invokeAndWait"));
+            }
+
+            invocations.countDown();
+        });
+
+        await(invocations, TIMEOUT_SECONDS * 2);
+        log.accept("executeOnAppKit + await - exited");
+
+        TEST_CASE_RESULT.complete(true);
+    }
+
     static void dumpAllThreads() {
         Thread.getAllStackTraces().keySet().forEach(t -> {
             System.out.printf("%s\t%s\t%d\t%s\n", t.getName(), t.getState(), t.getPriority(), t.isDaemon() ? "Daemon" : "Normal");

test/jdk/jb/java/awt/Toolkit/LWCToolkitInvokeAndWaitTest.java

@@ -18,8 +18,8 @@ import static helper.ToolkitTestHelper.TestCase.*;
  * @summary Tests different scenarios for LWCToolkit.invokeAndWait().
  * @requires (os.family == "mac")
  * @modules java.desktop/sun.lwawt.macosx java.desktop/sun.awt
- * @run main/othervm -Dsun.lwawt.macosx.LWCToolkit.invokeAndWait.disposeOnEDTFree=true LWCToolkitInvokeAndWaitTest
- * @run main/othervm -Dlog.level.FINER=true -Dsun.lwawt.macosx.LWCToolkit.invokeAndWait.disposeOnEDTFree=true LWCToolkitInvokeAndWaitTest
+ * @run main LWCToolkitInvokeAndWaitTest
+ * @run main/othervm -Dlog.level.FINER=true LWCToolkitInvokeAndWaitTest
  * @author Anton Tarasov
  */
 @SuppressWarnings("ConstantConditions")
@@ -32,6 +32,8 @@ public class LWCToolkitInvokeAndWaitTest {
     static volatile CountDownLatch EDT_FAST_FREE_LATCH;
 
     static {
+        System.setProperty("sun.lwawt.macosx.LWCToolkit.invokeAndWait.disposeOnEDTFree", "true");
+
         AWTThreading.setAWTThreadingFactory(edt -> new AWTThreading(edt) {
             @Override
             public CompletableFuture<Void> onEventDispatchThreadFree(Runnable runnable) {

test/jdk/jb/java/awt/Toolkit/helper/ToolkitTestHelper.java

@@ -8,6 +8,8 @@ import sun.lwawt.macosx.LWCToolkit;
 import javax.swing.*;
 import javax.swing.Timer;
 import java.awt.*;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
 import java.util.Optional;
 import java.util.Random;
 import java.util.concurrent.Callable;
@@ -65,6 +67,7 @@ public class ToolkitTestHelper {
             handler.uncaughtException(t, e);
         });
 
+        CountDownLatch showLatch = new CountDownLatch(1);
         tryRun(() -> EventQueue.invokeAndWait(() -> {
             FRAME = new JFrame(testClass.getSimpleName());
             LABEL = new JLabel("0");
@@ -75,8 +78,16 @@ public class ToolkitTestHelper {
             FRAME.setLocationRelativeTo(null);
             FRAME.setSize(200, 200);
             FRAME.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
+            FRAME.addComponentListener(new ComponentAdapter() {
+                @Override
+                public void componentShown(ComponentEvent e) {
+                    showLatch.countDown();
+                }
+            });
             FRAME.setVisible(true);
         }));
+        //noinspection ResultOfMethodCallIgnored
+        tryRun(() -> showLatch.await(1, TimeUnit.SECONDS));
 
         Timer timer = new Timer(100, e -> UPDATE_LABEL.run());
         timer.setRepeats(true);

test/jdk/jbA11yProblemList.txt

@@ -1 +1,4 @@
-sanity/client/SwingSet/src/TreeDemoTest.java                                                  JBR-3389 macosx-all
+java/awt/Toolkit/LWCToolkitInvokeAndWaitTest.java   nobug macosx-all,linux-all,windows-all
+java/awt/Toolkit/AWTThreadingTest.java              nobug macosx-all,linux-all,windows-all
+java/awt/Toolkit/AWTThreadingCMenuTest.java         nobug macosx-all,linux-all,windows-all
+sanity/client/SwingSet/src/TreeDemoTest.java        JBR-3389 macosx-all

test/jdk/jbProblemList.txt

@@ -518,6 +518,7 @@ java/awt/dnd/DisposeFrameOnDragCrash/DisposeFrameOnDragTest.java 8202790 macosx-
 java/awt/dnd/MissingDragExitEventTest/MissingDragExitEventTest.java 8030121 macosx-all,linux-all
 java/awt/Choice/ChoicePopupLocation/ChoicePopupLocation.java 8202931 macosx-all,linux-all
 java/awt/Focus/NonFocusableBlockedOwnerTest/NonFocusableBlockedOwnerTest.java 7124275 macosx-all
+java/awt/Focus/NonFocusableWindowTest/NonfocusableOwnerTest.java 8280392
 java/awt/Focus/TranserFocusToWindow/TranserFocusToWindow.java 6848810 macosx-all,linux-all
 java/awt/FileDialog/ModalFocus/FileDialogModalFocusTest.java 8194751 linux-all
 java/awt/image/VolatileImage/BitmaskVolatileImage.java 8133102 linux-all