8278050: Armenian text isn't rendered on macOS if text layout is performed

Reviewed-by: prr, serb

Author: Dmitry Batrak

src/java.desktop/macosx/classes/sun/font/CFont.java

@@ -206,7 +206,7 @@ private CompositeFont createCompositeFont() {
 
         // In some italic cases the standard Mac cascade list is missing Arabic.
         listOfString.add("GeezaPro");
-        FontManager fm = FontManagerFactory.getInstance();
+        CFontManager fm = (CFontManager) FontManagerFactory.getInstance();
         int numFonts = 1 + listOfString.size();
         PhysicalFont[] fonts = new PhysicalFont[numFonts];
         fonts[0] = this;
@@ -222,7 +222,7 @@ private CompositeFont createCompositeFont() {
                 // Don't know why we get the weird name above .. replace.
                 s = "AppleSymbols";
             }
-            Font2D f2d = fm.findFont2D(s, Font.PLAIN, FontManager.NO_FALLBACK);
+            Font2D f2d = fm.getOrCreateFallbackFont(s);
             if (f2d == null || f2d == this) {
                 continue;
             }

src/java.desktop/macosx/classes/sun/font/CFontManager.java

@@ -33,8 +33,10 @@
 import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.Locale;
+import java.util.Map;
 import java.util.TreeMap;
 import java.util.Vector;
+import java.util.concurrent.ConcurrentHashMap;
 
 import javax.swing.plaf.FontUIResource;
 
@@ -45,6 +47,7 @@
 
 public final class CFontManager extends SunFontManager {
     private static Hashtable<String, Font2D> genericFonts = new Hashtable<String, Font2D>();
+    private final Map<String, Font2D> fallbackFonts = new ConcurrentHashMap<>();
 
     @Override
     protected FontConfiguration createFontConfiguration() {
@@ -321,4 +324,17 @@ protected FontUIResource getFontConfigFUIR(
     @Override
     protected void populateFontFileNameMap(HashMap<String, String> fontToFileMap, HashMap<String, String> fontToFamilyNameMap,
             HashMap<String, ArrayList<String>> familyToFontListMap, Locale locale) {}
+
+    Font2D getOrCreateFallbackFont(String fontName) {
+        Font2D font2D = findFont2D(fontName, Font.PLAIN, FontManager.NO_FALLBACK);
+        if (font2D != null || fontName.startsWith(".")) {
+            return font2D;
+        } else {
+            // macOS doesn't list some system fonts in [NSFontManager availableFontFamilies] output,
+            // so they are not registered in font manager as part of 'loadNativeFonts'.
+            // These fonts are present in [NSFontManager availableFonts] output though,
+            // and can be accessed in the same way as other system fonts.
+            return fallbackFonts.computeIfAbsent(fontName, name -> new CFont(name, null));
+        }
+    }
 }