Added test for JDK-8312603

Merged with latest OpenJFX

pom.xml

@@ -8,7 +8,7 @@
     <groupId>org.marlin</groupId>
     <artifactId>marlinfx</artifactId>
     <packaging>jar</packaging>
-    <version>0.9.4.6-Unsafe-OpenJFX11</version>
+    <version>0.9.4.8-Unsafe-OpenJFX11</version>
     <name>Marlin software rasterizer</name>
 
     <url>https://github.com/bourgesl/marlin-renderer</url>
@@ -78,9 +78,9 @@
                         <arg>--patch-module</arg>
                         <arg>javafx.graphics=src</arg>
                         <arg>--add-modules</arg>
-                        <arg>jdk.unsupported,java.logging</arg>
+                        <arg>jdk.unsupported,java.logging,javafx.controls</arg>
                         <arg>--add-reads</arg>
-                        <arg>javafx.graphics=jdk.unsupported,java.logging</arg>
+                        <arg>javafx.graphics=jdk.unsupported,java.logging,javafx.controls</arg>
                     </compilerArgs>
                 </configuration>
                 <executions>
@@ -97,9 +97,9 @@
                                 <arg>--module-path</arg>
                                 <arg>${project.build.directory}/test-libs</arg>
                                 <arg>--add-modules</arg>
-                                <arg>jdk.unsupported,java.logging,junit,hamcrest.core,javafx.swing</arg>
+                                <arg>jdk.unsupported,java.logging,junit,hamcrest.core,javafx.swing,javafx.controls</arg>
                                 <arg>--add-reads</arg>
-                                <arg>javafx.graphics=jdk.unsupported,java.logging,junit,hamcrest.core,javafx.swing</arg>
+                                <arg>javafx.graphics=jdk.unsupported,java.logging,junit,hamcrest.core,javafx.swing,javafx.controls</arg>
                             </compilerArgs>
                         </configuration>
                     </execution>

src/main/java/com/sun/marlin/DMarlinRenderingEngine.java

@@ -94,15 +94,15 @@ private DMarlinRenderingEngine() {
         }
 
         if (USE_THREAD_LOCAL) {
-            RDR_CTX_PROVIDER = new ReentrantContextProviderTL<RendererContext>(REF_TYPE)
+            RDR_CTX_PROVIDER = new ReentrantContextProviderTL<>(REF_TYPE)
                 {
                     @Override
                     protected RendererContext newContext() {
                         return RendererContext.createContext();
                     }
                 };
         } else {
-            RDR_CTX_PROVIDER = new ReentrantContextProviderCLQ<RendererContext>(REF_TYPE)
+            RDR_CTX_PROVIDER = new ReentrantContextProviderCLQ<>(REF_TYPE)
                 {
                     @Override
                     protected RendererContext newContext() {
@@ -257,7 +257,6 @@ public static void logSettings(final String reClass) {
      * Get the RendererContext instance dedicated to the current thread
      * @return RendererContext instance
      */
-    @SuppressWarnings({"unchecked"})
     public static RendererContext getRendererContext() {
         final RendererContext rdrCtx = RDR_CTX_PROVIDER.acquire();
         if (DO_MONITORS) {

src/main/java/com/sun/marlin/Renderer.java

@@ -536,6 +536,7 @@ private void addLine(double x1, double y1, double x2, double y2) {
         blkFlags     = blkFlags_ref.initial;
     }
 
+    @Override
     public Renderer init(final int pix_boundsX, final int pix_boundsY,
                   final int pix_boundsWidth, final int pix_boundsHeight,
                   final int windingRule)
@@ -591,6 +592,7 @@ public Renderer init(final int pix_boundsX, final int pix_boundsY,
     /**
      * Disposes this renderer and recycle it clean up before reusing this instance
      */
+    @Override
     public void dispose() {
         if (DO_STATS) {
             rdrCtx.stats.stat_rdr_activeEdges.add(activeEdgeMaxUsed);
@@ -1531,6 +1533,7 @@ void initConsumer(int minx, int miny, int maxx, int maxy)
 
     private int bbox_spminX, bbox_spmaxX, bbox_spminY, bbox_spmaxY;
 
+    @Override
     public void produceAlphas(final MarlinAlphaConsumer ac) {
         ac.setMaxAlpha(MAX_AA_ALPHA);
 

src/main/java/com/sun/marlin/RendererContext.java

@@ -197,7 +197,7 @@ public Path2D getPath2D() {
             p2d = new Path2D(WIND_NON_ZERO, INITIAL_EDGES_COUNT); // 32K
 
             // update weak reference:
-            refPath2D = new WeakReference<Path2D>(p2d);
+            refPath2D = new WeakReference<>(p2d);
         }
         // reset the path anyway:
         p2d.reset();

src/main/java/com/sun/marlin/RendererNoAA.java

@@ -527,6 +527,7 @@ private void addLine(double x1, double y1, double x2, double y2) {
         blkFlags     = blkFlags_ref.initial;
     }
 
+    @Override
     public RendererNoAA init(final int pix_boundsX, final int pix_boundsY,
                   final int pix_boundsWidth, final int pix_boundsHeight,
                   final int windingRule)
@@ -580,6 +581,7 @@ public RendererNoAA init(final int pix_boundsX, final int pix_boundsY,
     /**
      * Disposes this renderer and recycle it clean up before reusing this instance
      */
+    @Override
     public void dispose() {
         if (DO_STATS) {
             rdrCtx.stats.stat_rdr_activeEdges.add(activeEdgeMaxUsed);
@@ -1443,6 +1445,7 @@ void initConsumer(int minx, int miny, int maxx, int maxy)
 
     private int bbox_spminX, bbox_spmaxX, bbox_spminY, bbox_spmaxY;
 
+    @Override
     public void produceAlphas(final MarlinAlphaConsumer ac) {
         ac.setMaxAlpha(1);
 

src/main/java/com/sun/marlin/Version.java

@@ -27,7 +27,7 @@
 
 public final class Version {
 
-    private static final String VERSION = "marlinFX-0.9.4.6-Unsafe-OpenJFX";
+    private static final String VERSION = "marlinFX-0.9.4.8-Unsafe-OpenJFX";
 
     public static String getVersion() {
         return VERSION;

src/main/java/com/sun/prism/impl/PrismSettings.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2022, 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
@@ -93,6 +93,7 @@ public static enum RasterizerType {
         private RasterizerType(String publicname) {
             this.publicName = publicname;
         }
+        @Override
         public String toString() {
             return publicName;
         }

src/main/java/com/sun/prism/impl/shape/ShapeUtil.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2022, 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
@@ -25,14 +25,11 @@
 
 package com.sun.prism.impl.shape;
 
-import com.sun.javafx.geom.Path2D;
-import com.sun.javafx.geom.PathConsumer2D;
 import com.sun.javafx.geom.RectBounds;
 import com.sun.javafx.geom.Shape;
 import com.sun.javafx.geom.transform.BaseTransform;
 import com.sun.prism.BasicStroke;
 import com.sun.prism.impl.PrismSettings;
-import com.sun.prism.impl.PrismSettings.RasterizerType;
 
 public class ShapeUtil {
 

src/main/java/com/sun/prism/sw/SWContext.java

@@ -29,24 +29,19 @@
 import com.sun.javafx.geom.Rectangle;
 import com.sun.javafx.geom.Shape;
 import com.sun.javafx.geom.transform.BaseTransform;
-import com.sun.javafx.util.Logging;
 import com.sun.marlin.ArrayCacheIntClean;
 import com.sun.marlin.DMarlinRenderingEngine;
 import com.sun.marlin.RendererContext;
 import com.sun.marlin.MarlinAlphaConsumer;
 import com.sun.marlin.MarlinConst;
 import com.sun.marlin.MarlinRenderer;
-import com.sun.marlin.RendererContext;
 import com.sun.pisces.PiscesRenderer;
 import com.sun.prism.BasicStroke;
 import com.sun.prism.PixelFormat;
 import com.sun.prism.ResourceFactory;
 import com.sun.prism.Texture;
 import com.sun.prism.impl.PrismSettings;
 import com.sun.prism.impl.shape.DMarlinPrismUtils;
-import com.sun.prism.impl.shape.MaskData;
-import com.sun.prism.impl.shape.ShapeUtil;
-
 import java.lang.ref.SoftReference;
 
 final class SWContext {
@@ -215,7 +210,7 @@ void renderShape(PiscesRenderer pr, Shape shape, BasicStroke stroke, BaseTransfo
 
     private SWRTTexture initRBBuffer(int width, int height) {
         final SWRTTexture tex = (SWRTTexture)factory.createRTTexture(width, height, Texture.WrapMode.CLAMP_NOT_NEEDED);
-        readBackBufferRef = new SoftReference<SWRTTexture>(tex);
+        readBackBufferRef = new SoftReference<>(tex);
         return tex;
     }
 
@@ -248,7 +243,7 @@ SWRTTexture validateRBBuffer(int width, int height) {
     private SWArgbPreTexture initImagePaintTexture(int width, int height) {
         final SWArgbPreTexture tex = (SWArgbPreTexture)factory.createTexture(PixelFormat.INT_ARGB_PRE,
                 Texture.Usage.DEFAULT, Texture.WrapMode.REPEAT, width, height);
-        imagePaintTextureRef = new SoftReference<SWArgbPreTexture>(tex);
+        imagePaintTextureRef = new SoftReference<>(tex);
         return tex;
     }
 

src/main/java/com/sun/util/reentrant/ReentrantContextProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2022, 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
@@ -137,14 +137,14 @@ protected final Reference<K> getOrCreateReference(final K ctx) {
             // Create the reference:
             switch (refType) {
                 case REF_HARD:
-                    ctx.reference = new HardReference<K>(ctx);
+                    ctx.reference = new HardReference<>(ctx);
                     break;
                 case REF_SOFT:
-                    ctx.reference = new SoftReference<K>(ctx);
+                    ctx.reference = new SoftReference<>(ctx);
                     break;
                 default:
                 case REF_WEAK:
-                    ctx.reference = new WeakReference<K>(ctx);
+                    ctx.reference = new WeakReference<>(ctx);
                     break;
             }
         }

src/main/java/com/sun/util/reentrant/ReentrantContextProviderCLQ.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2022, 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
@@ -43,7 +43,7 @@ public abstract class ReentrantContextProviderCLQ<K extends ReentrantContext>
 {
     // ReentrantContext queue to store all contexts
     private final ConcurrentLinkedQueue<Reference<K>> ctxQueue
-        = new ConcurrentLinkedQueue<Reference<K>>();
+        = new ConcurrentLinkedQueue<>();
 
     /**
      * Create a new ReentrantContext provider using the given reference type

src/main/java/com/sun/util/reentrant/ReentrantContextProviderTL.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2022, 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
@@ -43,7 +43,7 @@ public abstract class ReentrantContextProviderTL<K extends ReentrantContext>
 {
     // Thread-local storage:
     private final ThreadLocal<Reference<K>> ctxTL
-        = new ThreadLocal<Reference<K>>();
+        = new ThreadLocal<>();
 
     // ReentrantContext CLQ provider for child contexts:
     private final ReentrantContextProviderCLQ<K> ctxProviderCLQ;
@@ -72,7 +72,7 @@ public ReentrantContextProviderTL(final int refTypeTL, final int refTypeCLQ)
 
         final ReentrantContextProviderTL<K> parent = this;
 
-        this.ctxProviderCLQ = new ReentrantContextProviderCLQ<K>(refTypeCLQ) {
+        this.ctxProviderCLQ = new ReentrantContextProviderCLQ<>(refTypeCLQ) {
             @Override
             protected K newContext() {
                 return parent.newContext();