--- old/src/share/classes/sun/java2d/SurfaceData.java	2014-05-28 21:14:22.531908200 +0400
+++ new/src/share/classes/sun/java2d/SurfaceData.java	2014-05-28 21:14:21.881325600 +0400
@@ -577,8 +577,8 @@
                     sg2d.shapepipe = colorPrimitives;
                 }
                 if (sg2d.clipState == SunGraphics2D.CLIP_SHAPE) {
-                    sg2d.drawpipe = converter;
-                    sg2d.fillpipe = converter;
+                    sg2d.drawpipe = paintViaShape;
+                    sg2d.fillpipe = paintViaShape;
                     // REMIND: We should not be changing text strategies
                     // between outline and glyph rendering based upon the
                     // presence of a complex clip as that could cause a