6870238: Font2DTest fails on Debian after FontManager refactoring
Use fontManager field instead of querying the FontManagerFactory Reviewed-by: igor, prr
This commit is contained in:
parent
db5938b208
commit
afb1868fc4
@ -90,7 +90,7 @@ public class FcFontConfiguration extends FontConfiguration {
|
|||||||
|
|
||||||
setFontConfiguration();
|
setFontConfiguration();
|
||||||
readFcInfo();
|
readFcInfo();
|
||||||
X11FontManager fm = X11FontManager.getInstance();
|
X11FontManager fm = (X11FontManager) fontManager;
|
||||||
FontConfigManager fcm = fm.getFontConfigManager();
|
FontConfigManager fcm = fm.getFontConfigManager();
|
||||||
if (fcCompFonts == null) {
|
if (fcCompFonts == null) {
|
||||||
fcCompFonts = fcm.loadFontConfig();
|
fcCompFonts = fcm.loadFontConfig();
|
||||||
@ -187,7 +187,7 @@ public class FcFontConfiguration extends FontConfiguration {
|
|||||||
@Override
|
@Override
|
||||||
public String[] getPlatformFontNames() {
|
public String[] getPlatformFontNames() {
|
||||||
HashSet<String> nameSet = new HashSet<String>();
|
HashSet<String> nameSet = new HashSet<String>();
|
||||||
X11FontManager fm = X11FontManager.getInstance();
|
X11FontManager fm = (X11FontManager) fontManager;
|
||||||
FontConfigManager fcm = fm.getFontConfigManager();
|
FontConfigManager fcm = fm.getFontConfigManager();
|
||||||
FcCompFont[] fcCompFonts = fcm.loadFontConfig();
|
FcCompFont[] fcCompFonts = fcm.loadFontConfig();
|
||||||
for (int i=0; i<fcCompFonts.length; i++) {
|
for (int i=0; i<fcCompFonts.length; i++) {
|
||||||
@ -228,7 +228,7 @@ public class FcFontConfiguration extends FontConfiguration {
|
|||||||
@Override
|
@Override
|
||||||
public CompositeFontDescriptor[] get2DCompositeFontInfo() {
|
public CompositeFontDescriptor[] get2DCompositeFontInfo() {
|
||||||
|
|
||||||
X11FontManager fm = X11FontManager.getInstance();
|
X11FontManager fm = (X11FontManager) fontManager;
|
||||||
FontConfigManager fcm = fm.getFontConfigManager();
|
FontConfigManager fcm = fm.getFontConfigManager();
|
||||||
FcCompFont[] fcCompFonts = fcm.loadFontConfig();
|
FcCompFont[] fcCompFonts = fcm.loadFontConfig();
|
||||||
|
|
||||||
@ -363,7 +363,7 @@ public class FcFontConfiguration extends FontConfiguration {
|
|||||||
private void writeFcInfo() {
|
private void writeFcInfo() {
|
||||||
Properties props = new Properties();
|
Properties props = new Properties();
|
||||||
props.setProperty("version", fileVersion);
|
props.setProperty("version", fileVersion);
|
||||||
X11FontManager fm = X11FontManager.getInstance();
|
X11FontManager fm = (X11FontManager) fontManager;
|
||||||
FontConfigManager fcm = fm.getFontConfigManager();
|
FontConfigManager fcm = fm.getFontConfigManager();
|
||||||
FontConfigInfo fcInfo = fcm.getFontConfigInfo();
|
FontConfigInfo fcInfo = fcm.getFontConfigInfo();
|
||||||
props.setProperty("fcversion", Integer.toString(fcInfo.fcVersion));
|
props.setProperty("fcversion", Integer.toString(fcInfo.fcVersion));
|
||||||
@ -424,7 +424,7 @@ public class FcFontConfiguration extends FontConfiguration {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Properties props = new Properties();
|
Properties props = new Properties();
|
||||||
X11FontManager fm = X11FontManager.getInstance();
|
X11FontManager fm = (X11FontManager) fontManager;
|
||||||
FontConfigManager fcm = fm.getFontConfigManager();
|
FontConfigManager fcm = fm.getFontConfigManager();
|
||||||
try {
|
try {
|
||||||
FileInputStream fis = new FileInputStream(fcFile);
|
FileInputStream fis = new FileInputStream(fcFile);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user