diff -r fd16c54261b3 -r 90ce3da70b43 jdk/src/share/classes/sun/java2d/loops/DrawGlyphList.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/sun/java2d/loops/DrawGlyphList.java	Sat Dec 01 00:00:00 2007 +0000
@@ -0,0 +1,161 @@
+/*
+ * Copyright 2000-2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package sun.java2d.loops;
+
+import sun.java2d.loops.GraphicsPrimitive;
+import sun.java2d.pipe.Region;
+import sun.java2d.SunGraphics2D;
+import sun.java2d.SurfaceData;
+import sun.font.GlyphList;
+
+/**
+ *   DrawGlyphList - loops for SolidTextRenderer pipe.
+ *   1) draw solid color text onto destination surface
+ *   2) must accept output area [x, y, dx, dy]
+ *      from within the surface description data for clip rect
+ */
+public class DrawGlyphList extends GraphicsPrimitive {
+
+    public final static String methodSignature = "DrawGlyphList(...)".toString();
+
+    public final static int primTypeID = makePrimTypeID();
+
+    public static DrawGlyphList locate(SurfaceType srctype,
+                                   CompositeType comptype,
+                                   SurfaceType dsttype)
+    {
+        return (DrawGlyphList)
+            GraphicsPrimitiveMgr.locate(primTypeID,
+                                        srctype, comptype, dsttype);
+    }
+
+    protected DrawGlyphList(SurfaceType srctype,
+                         CompositeType comptype,
+                         SurfaceType dsttype)
+    {
+        super(methodSignature, primTypeID, srctype, comptype, dsttype);
+    }
+
+    public DrawGlyphList(long pNativePrim,
+                         SurfaceType srctype,
+                         CompositeType comptype,
+                         SurfaceType dsttype)
+    {
+        super(pNativePrim, methodSignature, primTypeID, srctype, comptype, dsttype);
+    }
+
+
+    public native void DrawGlyphList(SunGraphics2D sg2d, SurfaceData dest,
+                                     GlyphList srcData);
+
+    // This instance is used only for lookup.
+    static {
+        GraphicsPrimitiveMgr.registerGeneral(
+                                new DrawGlyphList(null, null, null));
+    }
+
+    public GraphicsPrimitive makePrimitive(SurfaceType srctype,
+                                           CompositeType comptype,
+                                           SurfaceType dsttype) {
+        return new General(srctype, comptype, dsttype);
+    }
+
+    private static class General extends DrawGlyphList {
+        MaskFill maskop;
+
+        public General(SurfaceType srctype,
+                       CompositeType comptype,
+                       SurfaceType dsttype)
+        {
+            super(srctype, comptype, dsttype);
+            maskop = MaskFill.locate(srctype, comptype, dsttype);
+        }
+
+        public void DrawGlyphList(SunGraphics2D sg2d, SurfaceData dest,
+                                  GlyphList gl) {
+
+            int strbounds[] = gl.getBounds(); // Don't delete, bug 4895493
+            int num = gl.getNumGlyphs();
+            Region clip = sg2d.getCompClip();
+            int cx1 = clip.getLoX();
+            int cy1 = clip.getLoY();
+            int cx2 = clip.getHiX();
+            int cy2 = clip.getHiY();
+            for (int i = 0; i < num; i++) {
+                gl.setGlyphIndex(i);
+                int metrics[] = gl.getMetrics();
+                int gx1 = metrics[0];
+                int gy1 = metrics[1];
+                int w = metrics[2];
+                int gx2 = gx1 + w;
+                int gy2 = gy1 + metrics[3];
+                int off = 0;
+                if (gx1 < cx1) {
+                    off = cx1 - gx1;
+                    gx1 = cx1;
+                }
+                if (gy1 < cy1) {
+                    off += (cy1 - gy1) * w;
+                    gy1 = cy1;
+                }
+                if (gx2 > cx2) gx2 = cx2;
+                if (gy2 > cy2) gy2 = cy2;
+                if (gx2 > gx1 && gy2 > gy1) {
+                    byte alpha[] = gl.getGrayBits();
+                    maskop.MaskFill(sg2d, dest, sg2d.composite,
+                                    gx1, gy1, gx2 - gx1, gy2 - gy1,
+                                    alpha, off, w);
+                }
+            }
+        }
+    }
+
+    public GraphicsPrimitive traceWrap() {
+        return new TraceDrawGlyphList(this);
+    }
+
+    private static class TraceDrawGlyphList extends DrawGlyphList {
+        DrawGlyphList target;
+
+        public TraceDrawGlyphList(DrawGlyphList target) {
+            super(target.getSourceType(),
+                  target.getCompositeType(),
+                  target.getDestType());
+            this.target = target;
+        }
+
+        public GraphicsPrimitive traceWrap() {
+            return this;
+        }
+
+        public void DrawGlyphList(SunGraphics2D sg2d, SurfaceData dest,
+                                  GlyphList glyphs)
+        {
+            tracePrimitive(target);
+            target.DrawGlyphList(sg2d, dest, glyphs);
+        }
+    }
+}