src/java.desktop/share/native/libfontmanager/hb-jdk.h

*** 27,48 ****
  #define HB_JDK_H
  
  #include "hb.h"
  #include <jni.h>
  #include <sunfontids.h>
- #include <fontscalerdefs.h>
  
  # ifdef __cplusplus
  extern "C" {
  #endif
  
  typedef struct JDKFontInfo_Struct {
      JNIEnv* env;
      jobject font2D;
      jobject fontStrike;
      long nativeFont;
-     TTLayoutTableCache *layoutTables;
      float matrix[4];
      float ptSize;
      float xPtSize;
      float yPtSize;
      float devScale; // How much applying the full glyph tx scales x distance.
--- 27,46 ----
*** 63,73 ****
  
  hb_face_t *
  hb_jdk_face_create(JDKFontInfo*   jdkFontInfo,
                     hb_destroy_func_t destroy);
  hb_font_t *
! hb_jdk_font_create(JDKFontInfo*   jdkFontInfo,
                     hb_destroy_func_t destroy);
  
  
  /* Makes an hb_font_t use JDK internally to implement font functions. */
  void
--- 61,72 ----
  
  hb_face_t *
  hb_jdk_face_create(JDKFontInfo*   jdkFontInfo,
                     hb_destroy_func_t destroy);
  hb_font_t *
! hb_jdk_font_create(hb_face_t* hbFace,
!                    JDKFontInfo*   jdkFontInfo,
                     hb_destroy_func_t destroy);
  
  
  /* Makes an hb_font_t use JDK internally to implement font functions. */
  void