JBR-1517 Update font layout speedup code to match the variant submitted to OpenJDK (JDK-8220231)

revert original implementation of font layout speedup

Author: JB-Dmitry

src/java.desktop/macosx/classes/sun/font/CFont.java

@@ -31,20 +31,12 @@
 import java.awt.geom.GeneralPath;
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 
 // Right now this class is final to avoid a problem with native code.
 // For some reason the JNI IsInstanceOf was not working correctly
 // so we are checking the class specifically. If we subclass this
 // we need to modify the native code in CFontWrapper.m
 public final class CFont extends PhysicalFont implements FontSubstitution {
-    private static final boolean useCoreTextLayout;
-
-    static {
-        useCoreTextLayout = AccessController.doPrivileged((PrivilegedAction<Boolean>) () ->
-                Boolean.getBoolean("sun.font.use.coretext.layout"));
-    }
 
     /* CFontStrike doesn't call these methods so they are unimplemented.
      * They are here to meet the requirements of PhysicalFont, needed
@@ -254,13 +246,6 @@ String getNativeFontName() {
         return nativeFontName;
     }
 
-    @Override
-    protected boolean isAAT() {
-        // CoreText layout code ignores fractional metrics font attribute
-        // also, using CoreText layout in Harfbuzz code leads to wrong advances for emoji glyphs
-        return useCoreTextLayout && !"AppleColorEmoji".equals(nativeFontName) && super.isAAT();
-    }
-
     // <rdar://problem/5321707> sun.font.Font2D caches the last used strike,
     // but does not check if the properties of the strike match the properties
     // of the incoming java.awt.Font object (size, style, etc).

src/java.desktop/share/classes/sun/font/Font2D.java

@@ -25,9 +25,6 @@
 
 package sun.font;
 
-import sun.java2d.Disposer;
-import sun.java2d.DisposerRecord;
-
 import java.awt.Font;
 import java.awt.font.FontRenderContext;
 import java.awt.geom.AffineTransform;
@@ -80,8 +77,6 @@ public abstract class Font2D {
     protected FontFamily family;
     protected int fontRank = DEFAULT_RANK;
 
-    private HarfbuzzFaceRef harfbuzzFaceRef;
-
     /*
      * A mapper can be independent of the strike.
      * Perhaps the reference to the mapper ought to be held on the
@@ -485,23 +480,6 @@ protected long getPlatformNativeFontPtr() {
         return 0L;
     }
 
-    protected boolean isAAT() {
-        return false;
-    }
-
-    synchronized long getHarfbuzzFacePtr() {
-        if (harfbuzzFaceRef == null) {
-            long harfbuzzFaceNativePtr = createHarfbuzzFace(isAAT(), getPlatformNativeFontPtr());
-            if (harfbuzzFaceNativePtr == 0) return 0;
-            harfbuzzFaceRef = new HarfbuzzFaceRef(harfbuzzFaceNativePtr);
-            Disposer.addObjectRecord(this, harfbuzzFaceRef);
-        }
-        return harfbuzzFaceRef.harfbuzzFaceNativePtr;
-    }
-
-    private native long createHarfbuzzFace(boolean aat, long platformNativeFontPtr);
-    private static native void disposeHarfbuzzFace(long harfbuzzFaceNativePtr);
-
     /* for layout code */
     protected long getUnitsPerEm() {
         return 2048;
@@ -587,17 +565,4 @@ public float getItalicAngle(Font font, AffineTransform at,
         }
     }
 
-
-    private static class HarfbuzzFaceRef implements DisposerRecord {
-        private final long harfbuzzFaceNativePtr;
-
-        private HarfbuzzFaceRef(long harfbuzzFaceNativePtr) {
-            this.harfbuzzFaceNativePtr = harfbuzzFaceNativePtr;
-        }
-
-        @Override
-        public void dispose() {
-            disposeHarfbuzzFace(harfbuzzFaceNativePtr);
-        }
-    }
 }

src/java.desktop/share/classes/sun/font/PhysicalFont.java

@@ -79,12 +79,6 @@ Point2D.Float getGlyphPoint(long pScalerContext,
         return new Point2D.Float();
     }
 
-    @Override
-    protected boolean isAAT() {
-        return getTableBytes(TrueTypeFont.morxTag) != null ||
-               getTableBytes(TrueTypeFont.mortTag) != null;
-    }
-
     /* These 3 metrics methods should be implemented to return
      * values in user space.
      */

src/java.desktop/share/classes/sun/font/SunLayoutEngine.java

@@ -144,6 +144,12 @@ public LayoutEngine getEngine(LayoutEngineKey key) {
     private SoftReference<ConcurrentHashMap<LayoutEngineKey, LayoutEngine>> cacheref =
         new SoftReference<>(null);
 
+    private boolean isAAT(Font2D font) {
+       // CoreText layout code ignores fractional metrics font attribute
+       // also, using CoreText layout in Harfbuzz code leads to wrong advances for emoji glyphs
+       return false;
+    }
+
     private SunLayoutEngine(LayoutEngineKey key) {
         this.key = key;
     }
@@ -153,8 +159,15 @@ public void layout(FontStrikeDesc desc, float[] mat, float ptSize, int gmask,
                        Point2D.Float pt, GVData data) {
         Font2D font = key.font();
         FontStrike strike = font.getStrike(desc);
-        shape(font, strike, ptSize, mat,
-              font.getHarfbuzzFacePtr(), font.getPlatformNativeFontPtr(), font.isAAT(),
+        long layoutTables = font.getLayoutTableCache();
+        long pNativeFont = font.getPlatformNativeFontPtr(); // used on OSX
+        // pScaler probably not needed long term.
+        long pScaler = 0L;
+        if (font instanceof FileFont) {
+            pScaler = ((FileFont)font).getScaler().nativeScaler;
+        }
+        shape(font, strike, ptSize, mat, pScaler, pNativeFont,
+              layoutTables, isAAT(font),
               tr.text, data, key.script(),
               tr.start, tr.limit, baseIndex, pt,
               typo_flags, gmask);
@@ -163,7 +176,7 @@ public void layout(FontStrikeDesc desc, float[] mat, float ptSize, int gmask,
     /* Native method to invoke harfbuzz layout engine */
     private static native boolean
         shape(Font2D font, FontStrike strike, float ptSize, float[] mat,
-              long pscaler, long pNativeFont, boolean aat,
+              long pscaler, long pNativeFont, long layoutTables, boolean aat,
               char[] chars, GVData data,
               int script, int offset, int limit,
               int baseIndex, Point2D.Float pt, int typo_flags, int slot);

src/java.desktop/share/classes/sun/font/TrueTypeFont.java

@@ -999,12 +999,6 @@ public int getWeight() {
        return (fontWeight > 0) ? fontWeight : super.getWeight();
     }
 
-    @Override
-    protected boolean isAAT() {
-        return getDirectoryEntry(TrueTypeFont.morxTag) != null ||
-               getDirectoryEntry(TrueTypeFont.mortTag) != null;
-    }
-
     /* TrueTypeFont can use the fsSelection fields of OS/2 table
      * to determine the style. In the unlikely case that doesn't exist,
      * can use macStyle in the 'head' table but simpler to

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

@@ -201,7 +201,9 @@ JDKFontInfo*
                        jobject font2D,
                        jobject fontStrike,
                        jfloat ptSize,
+                       jlong pScaler,
                        jlong pNativeFont,
+                       jlong layoutTables,
                        jfloatArray matrix,
                        jboolean aat) {
 
@@ -214,6 +216,7 @@ JDKFontInfo*
     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;
@@ -238,8 +241,9 @@ JNIEXPORT jboolean JNICALL Java_sun_font_SunLayoutEngine_shape
      jobject fontStrike,
      jfloat ptSize,
      jfloatArray matrix,
-     jlong pFace,
+     jlong pScaler,
      jlong pNativeFont,
+     jlong layoutTables,
      jboolean aat,
      jcharArray text,
      jobject gvdata,
@@ -252,7 +256,6 @@ JNIEXPORT jboolean JNICALL Java_sun_font_SunLayoutEngine_shape
      jint slot) {
 
      hb_buffer_t *buffer;
-     hb_face_t* hbface;
      hb_font_t* hbfont;
      jchar  *chars;
      jsize len;
@@ -269,16 +272,15 @@ JNIEXPORT jboolean JNICALL Java_sun_font_SunLayoutEngine_shape
 
      JDKFontInfo *jdkFontInfo =
          createJDKFontInfo(env, font2D, fontStrike, ptSize,
-                           pNativeFont, matrix, aat);
+                           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;
      jdkFontInfo->fontStrike = fontStrike;
 
-     hbface = (hb_face_t*) jlong_to_ptr(pFace);
-     hbfont = hb_jdk_font_create(hbface, jdkFontInfo, NULL);
+     hbfont = hb_jdk_font_create(jdkFontInfo, NULL);
 
      buffer = hb_buffer_create();
      hb_buffer_set_script(buffer, getHBScriptCode(script));