From 0343cda2b46fb70bb4b8dfa54dd491e6b3d64017 Mon Sep 17 00:00:00 2001
From: lbourges <unknown>
Date: Wed, 25 Mar 2020 03:53:05 +0000
Subject: [PATCH] 8241307: Marlin renderer should not be the default in 8u252
 Reviewed-by: phh, alexsch, andrew, sgehwolf

---
 .../services/sun.java2d.pipe.RenderingEngine  |  7 +++-
 .../services/sun.java2d.pipe.RenderingEngine  |  9 ++--
 .../java2d/marlin/DefaultRenderingEngine.java | 42 +++++++++++++++++++
 3 files changed, 53 insertions(+), 5 deletions(-)
 create mode 100644 test/sun/java2d/marlin/DefaultRenderingEngine.java

diff --git a/src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine b/src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine
index 7019d69d1..e542b6f8c 100644
--- a/src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine
+++ b/src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine
@@ -1,5 +1,8 @@
-#  Pisces Rendering Engine module
-sun.java2d.pisces.PiscesRenderingEngine
+# note: the last class is the default Rendering Engine
+# Pisces in JDK8u, Marlin in JDK9+
 
 #  Marlin Rendering Engine module
 sun.java2d.marlin.MarlinRenderingEngine
+
+#  Pisces Rendering Engine module
+sun.java2d.pisces.PiscesRenderingEngine
diff --git a/src/solaris/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine b/src/solaris/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine
index d61568b76..d6fe0859f 100644
--- a/src/solaris/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine
+++ b/src/solaris/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine
@@ -1,8 +1,11 @@
+# note: the last class is the default Rendering Engine
+# Pisces in JDK8u, Marlin in JDK9+
+
+#  Marlin Rendering Engine module
+sun.java2d.marlin.MarlinRenderingEngine
+
 # Jules Rendering Engine module
 sun.java2d.jules.JulesRenderingEngine
 
 #  Pisces Rendering Engine module
 sun.java2d.pisces.PiscesRenderingEngine
-
-#  Marlin Rendering Engine module
-sun.java2d.marlin.MarlinRenderingEngine
diff --git a/test/sun/java2d/marlin/DefaultRenderingEngine.java b/test/sun/java2d/marlin/DefaultRenderingEngine.java
new file mode 100644
index 000000000..a6e632c7d
--- /dev/null
+++ b/test/sun/java2d/marlin/DefaultRenderingEngine.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2020, 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.
+ *
+ * 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import sun.java2d.pipe.RenderingEngine;
+
+/**
+ * @test
+ * @bug 8241307
+ * @summary Verifies that the default RenderingEngine is not the Marlin renderer in jdk8u
+ * @run main DefaultRenderingEngine
+ */
+public class DefaultRenderingEngine {
+
+    public static void main(String argv[]) {
+
+        final RenderingEngine engine = RenderingEngine.getInstance();
+
+        if (engine.getClass().getSimpleName().contains("Marlin")) {
+            throw new RuntimeException("Marlin must not be the default RenderingEngine in jdk8u !");
+        }
+    }
+}
-- 
GitLab