src/java.desktop/unix/classes/sun/java2d/xr/XRMaskFill.java

rev 48927 : Xrender: make aa tile mask handling a responsibility of the backend implementation
rev 48932 : XRender: Update+introduce copyright statements + comments + unused import removal

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. 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.  Oracle designates this

@@ -102,14 +102,11 @@
             XRSurfaceData x11sd = (XRSurfaceData) sData;
             x11sd.validateAsDestination(null, sg2d.getCompClip());
 
             XRCompositeManager maskBuffer = x11sd.maskBuffer;
             maskBuffer.validateCompositeState(comp, sg2d.transform, sg2d.paint, sg2d);
-
-            int maskPict = maskBuffer.getMaskBuffer().uploadMask(w, h, maskscan, maskoff, mask);
-            maskBuffer.XRComposite(XRUtils.None, maskPict, x11sd.picture, x, y, 0, 0, x, y, w, h);
-            maskBuffer.getMaskBuffer().clearUploadMask(maskPict, w, h);
+            maskBuffer.XRMaskedComposite(XRUtils.None, x11sd.picture, x, y, x, y, w, h, maskscan, maskoff, mask);
         } finally {
             SunToolkit.awtUnlock();
         }
     }
 }