src/solaris/classes/sun/java2d/xr/XRRenderer.java

@@ -25,11 +25,10 @@
 
 package sun.java2d.xr;
 
 import java.awt.*;
 import java.awt.geom.*;
-
 import sun.awt.SunToolkit;
 import sun.java2d.SunGraphics2D;
 import sun.java2d.loops.*;
 import sun.java2d.pipe.Region;
 import sun.java2d.pipe.PixelDrawPipe;

@@ -37,10 +36,13 @@
 import sun.java2d.pipe.ShapeDrawPipe;
 import sun.java2d.pipe.SpanIterator;
 import sun.java2d.pipe.ShapeSpanIterator;
 import sun.java2d.pipe.LoopPipe;
 
+import static sun.java2d.xr.XRUtils.clampToShort;
+import static sun.java2d.xr.XRUtils.clampToUShort;
+
 /**
  * XRender provides only accalerated rectangles. To emulate higher "order"
  *  geometry we have to pass everything else to DoPath/FillSpans.
  *
  * TODO: DrawRect could be instrified

@@ -68,21 +70,20 @@
                                                sg2d.paint, sg2d);
     }
 
     public void drawLine(SunGraphics2D sg2d, int x1, int y1, int x2, int y2) {
         Region compClip = sg2d.getCompClip();
-        int transX1 = x1 + sg2d.transX;
-        int transY1 = y1 + sg2d.transY;
-        int transX2 = x2 + sg2d.transX;
-        int transY2 = y2 + sg2d.transY;
+        int transX1 = Region.clipAdd(x1, sg2d.transX);
+        int transY1 = Region.clipAdd(y1, sg2d.transY);
+        int transX2 = Region.clipAdd(x2, sg2d.transX);
+        int transY2 = Region.clipAdd(y2, sg2d.transY);
 
         // Non clipped fast path
         if (compClip.contains(transX1, transY1)
                 && compClip.contains(transX2, transY2)) {
-            try {
                 SunToolkit.awtLock();
-
+            try {
                 validateSurface(sg2d);
                 tileManager.addLine(transX1, transY1, transX2, transY2);
                 tileManager.fillMask((XRSurfaceData) sg2d.surfaceData);
             } finally {
                 SunToolkit.awtUnlock();

@@ -113,24 +114,44 @@
     public void drawPolygon(SunGraphics2D sg2d,
                             int xpoints[], int ypoints[], int npoints) {
         draw(sg2d, new Polygon(xpoints, ypoints, npoints));
     }
 
-    public synchronized void fillRect(SunGraphics2D sg2d,
-                                      int x, int y, int width, int height) {
-        SunToolkit.awtLock();
-        try {
-            validateSurface(sg2d);
+    public void fillRect(SunGraphics2D sg2d, int x, int y, int width, int height) {     
+        x = Region.clipAdd(x, sg2d.transX);
+        y = Region.clipAdd(y, sg2d.transY);
+        
+        /*
+         * Limit x/y to signed short, width/height to unsigned short,
+         * to match the X11 coordinate limits for rectangles.
+         * Correct width/height in case x/y have been modified by clipping.
+         */     
+        if(x > Short.MAX_VALUE || y > Short.MAX_VALUE) {
+            return;
+        }
 
-            XRSurfaceData xrsd = (XRSurfaceData) sg2d.surfaceData;
+        int x2 = Region.dimAdd(x, width);
+        int y2 = Region.dimAdd(y, height);
 
-            x += sg2d.transform.getTranslateX();
-            y += sg2d.transform.getTranslateY();
+        if(x2 < Short.MIN_VALUE || y2 < Short.MIN_VALUE) {
+            return;
+        }
 
-            tileManager.addRect(x, y, width, height);
-            tileManager.fillMask(xrsd);
+        x = clampToShort(x);
+        y = clampToShort(y);
+        width = clampToUShort(x2 - x);
+        height = clampToUShort(y2 - y);
+
+        if (width <= 0 || height <= 0) {
+            return;
+        }
 
+        SunToolkit.awtLock();
+        try {
+            validateSurface(sg2d);
+            tileManager.addRect(x, y, width, height);
+            tileManager.fillMask((XRSurfaceData) sg2d.surfaceData);
         } finally {
             SunToolkit.awtUnlock();
         }
     }