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

*** 201,210 ****
--- 201,211 ----
                         jobject font2D,
                         jobject fontStrike,
                         jfloat ptSize,
                         jlong pScaler,
                         jlong pNativeFont,
+                        jlong layoutTables,
                         jfloatArray matrix,
                         jboolean aat) {
  
  
      JDKFontInfo *fi = (JDKFontInfo*)malloc(sizeof(JDKFontInfo));
*** 213,222 ****
--- 214,224 ----
      }
      fi->env = env; // this is valid only for the life of this JNI call.
      fi->font2D = font2D;
      fi->fontStrike = fontStrike;
      fi->nativeFont = pNativeFont;
+     fi->layoutTables = (TTLayoutTableCache*)layoutTables;
      fi->aat = aat;
      (*env)->GetFloatArrayRegion(env, matrix, 0, 4, fi->matrix);
      fi->ptSize = ptSize;
      fi->xPtSize = euclidianDistance(fi->matrix[0], fi->matrix[1]);
      fi->yPtSize = euclidianDistance(fi->matrix[2], fi->matrix[3]);
*** 239,248 ****
--- 241,251 ----
       jobject fontStrike,
       jfloat ptSize,
       jfloatArray matrix,
       jlong pScaler,
       jlong pNativeFont,
+      jlong layoutTables,
       jboolean aat,
       jcharArray text,
       jobject gvdata,
       jint script,
       jint offset,
*** 267,277 ****
       jboolean ret;
       unsigned int buflen;
  
       JDKFontInfo *jdkFontInfo =
           createJDKFontInfo(env, font2D, fontStrike, ptSize,
!                            pScaler, 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;
--- 270,280 ----
       jboolean ret;
       unsigned int buflen;
  
       JDKFontInfo *jdkFontInfo =
           createJDKFontInfo(env, font2D, fontStrike, ptSize,
!                            pScaler, pNativeFont, layoutTables, matrix, aat);
       if (!jdkFontInfo) {
          return JNI_FALSE;
       }
       jdkFontInfo->env = env; // this is valid only for the life of this JNI call.
       jdkFontInfo->font2D = font2D;