commit 30f998a9fc276a56c7bb96d450293932cb1bd476
author Dmitry Batrak <Dmitry.Batrak@jetbrains.com> Mon Dec 11 12:06:10 2017 +0300
committer Dmitry Batrak <Dmitry.Batrak@jetbrains.com> Mon Dec 11 12:06:10 2017 +0300
tree cc43b3ee7545708b20a961601720547e28018b79
parent 4ae0566f89d911d7510954484c6989c770e99f6d

JRE-593 Wrong italic font rendering for Source Code Pro

optimization (following JR-CR-226)

src/windows/native/sun/font/fontpath.c

diff --git a/src/windows/native/sun/font/fontpath.c b/src/windows/native/sun/font/fontpath.c
index 4433ecd..3da3014 100644
--- a/src/windows/native/sun/font/fontpath.c
+++ b/src/windows/native/sun/font/fontpath.c
@@ -759,11 +759,12 @@
 typedef struct SupportedCharsetsInfo {
     JNIEnv *env;
     jobject supportedCharsets;
-    jclass byteClassID;
-    jmethodID valueOfMID;
-    jmethodID putIfAbsentMID;
 } SupportedCharsetsInfo;
 
+static jclass byteClassID = NULL;
+static jmethodID valueOfMID = NULL;
+static jmethodID putIfAbsentMID = NULL;
+
 static int CALLBACK StoreSupportedCharset(ENUMLOGFONTEXW *lpelfe, NEWTEXTMETRICEX *lpntme, int FontType, LPARAM lParam)
 {
     SupportedCharsetsInfo* info = (SupportedCharsetsInfo*) lParam;
@@ -776,9 +777,8 @@
         return 1;
     }
 
-    charset = (*env)->CallStaticObjectMethod(env, info->byteClassID, info->valueOfMID,
-                                             (jbyte)(lpelfe->elfLogFont.lfCharSet));
-    (*env)->CallObjectMethod(env, info->supportedCharsets, info->putIfAbsentMID, fullName, charset);
+    charset = (*env)->CallStaticObjectMethod(env, byteClassID, valueOfMID, (jbyte)(lpelfe->elfLogFont.lfCharSet));
+    (*env)->CallObjectMethod(env, info->supportedCharsets, putIfAbsentMID, fullName, charset);
 
     return 1;
 }
@@ -791,24 +791,34 @@
     LOGFONTW lfw;
     HDC screenDC;
     SupportedCharsetsInfo info;
-    jclass mapClassID;
+    jclass byteClassIDLocal, mapClassIDLocal;
 
-    info.byteClassID = (*env)->FindClass(env, "java/lang/Byte");
-    if (info.byteClassID == NULL) {
-        return;
+    if (byteClassID == NULL) {
+        byteClassIDLocal = (*env)->FindClass(env, "java/lang/Byte");
+        if (byteClassIDLocal == NULL) {
+            return;
+        }
+        byteClassID = (*env)->NewGlobalRef(env, byteClassIDLocal);
+        if (byteClassID == NULL) {
+            return;
+        }
     }
-    info.valueOfMID = (*env)->GetStaticMethodID(env, info.byteClassID, "valueOf", "(B)Ljava/lang/Byte;");
-    if (info.valueOfMID == NULL) {
-        return;
+    if (valueOfMID == NULL) {
+        valueOfMID = (*env)->GetStaticMethodID(env, byteClassID, "valueOf", "(B)Ljava/lang/Byte;");
+        if (valueOfMID == NULL) {
+            return;
+        }
     }
-    mapClassID = (*env)->FindClass(env, "java/util/Map");
-    if (mapClassID == NULL) {
-        return;
-    }
-    info.putIfAbsentMID = (*env)->GetMethodID(env, mapClassID, "putIfAbsent", 
-                                              "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
-    if (info.putIfAbsentMID == NULL) {
-        return;
+    if (putIfAbsentMID == NULL) {
+        mapClassIDLocal = (*env)->FindClass(env, "java/util/Map");
+        if (mapClassIDLocal == NULL) {
+            return;
+        }
+        putIfAbsentMID = (*env)->GetMethodID(env, mapClassIDLocal, "putIfAbsent", 
+                                             "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
+        if (putIfAbsentMID == NULL) {
+            return;
+        }
     }
 
     info.env = env;