src/share/classes/sun/java2d/SunGraphics2D.java

rev 1297 : [mq]: fontmanager.patch

@@ -64,10 +64,11 @@
 import java.awt.image.ImageObserver;
 import java.awt.Transparency;
 import java.awt.font.GlyphVector;
 import java.awt.font.TextLayout;
 import sun.font.FontDesignMetrics;
+import sun.font.FontUtilities;
 import sun.java2d.pipe.PixelDrawPipe;
 import sun.java2d.pipe.PixelFillPipe;
 import sun.java2d.pipe.ShapeDrawPipe;
 import sun.java2d.pipe.ValidatePipe;
 import sun.java2d.pipe.ShapeSpanIterator;

@@ -590,11 +591,11 @@
                 info.devTx = IDENT_MATRIX;
                 devAt = IDENT_ATX;
             }
         }
 
-        info.font2D = FontManager.getFont2D(font);
+        info.font2D = FontUtilities.getFont2D(font);
 
         int fmhint = fractionalMetricsHint;
         if (fmhint == SunHints.INTVAL_FRACTIONALMETRICS_DEFAULT) {
             fmhint = SunHints.INTVAL_FRACTIONALMETRICS_OFF;
         }

@@ -739,11 +740,12 @@
                 textpipe != invalidpipe &&
                 (transformState > TRANSFORM_ANY_TRANSLATE ||
                  font.isTransformed() ||
                  fontInfo == null || // Precaution, if true shouldn't get here
                  (fontInfo.aaHint == SunHints.INTVAL_TEXT_ANTIALIAS_ON) !=
-                 FontManager.getFont2D(font).useAAForPtSize(font.getSize()))) {
+                     FontUtilities.getFont2D(font).
+                         useAAForPtSize(font.getSize()))) {
                 textpipe = invalidpipe;
             }
             this.font = font;
             this.fontMetrics = null;
             this.validFontInfo = false;