src/java.desktop/share/native/libfontmanager/HBShaper.c

@@ -199,11 +199,10 @@
 JDKFontInfo*
      createJDKFontInfo(JNIEnv *env,
                        jobject font2D,
                        jobject fontStrike,
                        jfloat ptSize,
-                       jlong pScaler,
                        jlong pNativeFont,
                        jfloatArray matrix,
                        jboolean aat) {
 
 

@@ -237,11 +236,11 @@
     (JNIEnv *env, jclass cls,
      jobject font2D,
      jobject fontStrike,
      jfloat ptSize,
      jfloatArray matrix,
-     jlong pScaler,
+     jlong pFace,
      jlong pNativeFont,
      jboolean aat,
      jcharArray text,
      jobject gvdata,
      jint script,

@@ -251,10 +250,11 @@
      jobject startPt,
      jint flags,
      jint slot) {
 
      hb_buffer_t *buffer;
+     hb_face_t* hbface;
      hb_font_t* hbfont;
      jchar  *chars;
      jsize len;
      int glyphCount;
      hb_glyph_info_t *glyphInfo;

@@ -267,19 +267,20 @@
      jboolean ret;
      unsigned int buflen;
 
      JDKFontInfo *jdkFontInfo =
          createJDKFontInfo(env, font2D, fontStrike, ptSize,
-                           pScaler, pNativeFont, matrix, aat);
+                           pNativeFont, matrix, aat);
      if (!jdkFontInfo) {
         return JNI_FALSE;
      }
      jdkFontInfo->env = env; // this is valid only for the life of this JNI call.
      jdkFontInfo->font2D = font2D;
      jdkFontInfo->fontStrike = fontStrike;
 
-     hbfont = hb_jdk_font_create(jdkFontInfo, NULL);
+     hbface = (hb_face_t*) jlong_to_ptr(pFace);
+     hbfont = hb_jdk_font_create(hbface, jdkFontInfo, NULL);
 
      buffer = hb_buffer_create();
      hb_buffer_set_script(buffer, getHBScriptCode(script));
      hb_buffer_set_language(buffer,
                             hb_ot_tag_to_language(HB_OT_TAG_DEFAULT_LANGUAGE));