7181199: [macosx] Startup is much slower in headless mode for apps using Fonts
Reviewed-by: jgodinez, prr
diff --git a/jdk/src/macosx/classes/sun/font/CFontManager.java b/jdk/src/macosx/classes/sun/font/CFontManager.java
index 5caca1e..a37fd81 100644
--- a/jdk/src/macosx/classes/sun/font/CFontManager.java
+++ b/jdk/src/macosx/classes/sun/font/CFontManager.java
@@ -37,6 +37,7 @@
import javax.swing.plaf.FontUIResource;
import sun.awt.FontConfiguration;
+import sun.awt.HeadlessToolkit;
import sun.lwawt.macosx.*;
public class CFontManager extends SunFontManager {
@@ -342,9 +343,14 @@
@Override
public String getFontPath(boolean noType1Fonts) {
// In the case of the Cocoa toolkit, since we go through NSFont, we dont need to register /Library/Fonts
- if (Toolkit.getDefaultToolkit() instanceof LWCToolkit) {
+ Toolkit tk = Toolkit.getDefaultToolkit();
+ if (tk instanceof HeadlessToolkit) {
+ tk = ((HeadlessToolkit)tk).getUnderlyingToolkit();
+ }
+ if (tk instanceof LWCToolkit) {
return "";
}
+
// X11 case
return "/Library/Fonts";
}
