src/share/classes/sun/java2d/pipe/GlyphListPipe.java

*** 23,43 ****
   * questions.
   */
  
  package sun.java2d.pipe;
  
- import java.awt.Font;
- import java.awt.Rectangle;
- import java.awt.Shape;
  import java.awt.font.FontRenderContext;
  import java.awt.font.GlyphVector;
  import java.awt.font.TextLayout;
  
! import sun.awt.SunHints;
  import sun.java2d.SunGraphics2D;
  import sun.java2d.SurfaceData;
- import sun.font.GlyphList;
  import sun.java2d.loops.FontInfo;
  
  /**
   * A delegate pipe of SG2D for drawing text.
   */
--- 23,39 ----
   * questions.
   */
  
  package sun.java2d.pipe;
  
  import java.awt.font.FontRenderContext;
  import java.awt.font.GlyphVector;
  import java.awt.font.TextLayout;
  
! import sun.font.GlyphList;
  import sun.java2d.SunGraphics2D;
  import sun.java2d.SurfaceData;
  import sun.java2d.loops.FontInfo;
  
  /**
   * A delegate pipe of SG2D for drawing text.
   */
*** 52,62 ****
              SurfaceData.outlineTextRenderer.drawString(sg2d, s, x, y);
              return;
          }
  
          float devx, devy;
!         if (sg2d.transformState >= sg2d.TRANSFORM_TRANSLATESCALE) {
              double origin[] = {x + info.originX, y + info.originY};
              sg2d.transform.transform(origin, 0, origin, 0, 1);
              devx = (float)origin[0];
              devy = (float)origin[1];
          } else {
--- 48,58 ----
              SurfaceData.outlineTextRenderer.drawString(sg2d, s, x, y);
              return;
          }
  
          float devx, devy;
!         if (sg2d.transformState >= SunGraphics2D.TRANSFORM_TRANSLATESCALE) {
              double origin[] = {x + info.originX, y + info.originY};
              sg2d.transform.transform(origin, 0, origin, 0, 1);
              devx = (float)origin[0];
              devy = (float)origin[1];
          } else {
*** 88,98 ****
          if (info.pixelHeight > OutlineTextRenderer.THRESHHOLD) {
              SurfaceData.outlineTextRenderer.drawChars(
                                          sg2d, data, offset, length, ix, iy);
              return;
          }
!         if (sg2d.transformState >= sg2d.TRANSFORM_TRANSLATESCALE) {
              double origin[] = {ix + info.originX, iy + info.originY};
              sg2d.transform.transform(origin, 0, origin, 0, 1);
              x = (float) origin[0];
              y = (float) origin[1];
          } else {
--- 84,94 ----
          if (info.pixelHeight > OutlineTextRenderer.THRESHHOLD) {
              SurfaceData.outlineTextRenderer.drawChars(
                                          sg2d, data, offset, length, ix, iy);
              return;
          }
!         if (sg2d.transformState >= SunGraphics2D.TRANSFORM_TRANSLATESCALE) {
              double origin[] = {ix + info.originX, iy + info.originY};
              sg2d.transform.transform(origin, 0, origin, 0, 1);
              x = (float) origin[0];
              y = (float) origin[1];
          } else {
*** 120,130 ****
          FontInfo info = sg2d.getGVFontInfo(gv.getFont(), frc);
          if (info.pixelHeight > OutlineTextRenderer.THRESHHOLD) {
              SurfaceData.outlineTextRenderer.drawGlyphVector(sg2d, gv, x, y);
              return;
          }
!         if (sg2d.transformState >= sg2d.TRANSFORM_TRANSLATESCALE) {
              double origin[] = {x, y};
              sg2d.transform.transform(origin, 0, origin, 0, 1);
              x = (float) origin[0];
              y = (float) origin[1];
          } else {
--- 116,126 ----
          FontInfo info = sg2d.getGVFontInfo(gv.getFont(), frc);
          if (info.pixelHeight > OutlineTextRenderer.THRESHHOLD) {
              SurfaceData.outlineTextRenderer.drawGlyphVector(sg2d, gv, x, y);
              return;
          }
!         if (sg2d.transformState >= SunGraphics2D.TRANSFORM_TRANSLATESCALE) {
              double origin[] = {x, y};
              sg2d.transform.transform(origin, 0, origin, 0, 1);
              x = (float) origin[0];
              y = (float) origin[1];
          } else {