mirrors/JetBrainsRuntime
1
0
Fork 0
mirror of https://github.com/JetBrains/JetBrainsRuntime.git synced 2025-12-06 09:29:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

JBR-1962 Allow to change font config

Browse Source 
Replaced several privileged blocks with just one

(cherry picked from commit faa8d3d258)
This commit is contained in:
Alexey Ushakov
2019-11-20 23:07:52 +03:00
committed by alexey.ushakov@jetbrains.com
parent 65cef7ca65
commit 069c80c027
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/java.desktop/share/classes/sun/font/FreetypeFontScaler.java
View File

@@ -51,17 +51,25 @@ class FreetypeFontScaler extends FontScaler {
and therefore no need to load it explicitly here */
FontManagerNativeLibrary.load();
@SuppressWarnings("removal")
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>) () -> {
if ("true".equals(System.getProperty(
"java2d.font.loadFontConf", ""))) {
File f = new File(System.getProperty("user.home", "") +
File.separator + ".fonts.conf");
if (!f.exists()) {
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,