Mercurial > hg > openjdk > jdk8u > jdk
changeset 13882:e17fe591a374 jdk8u252-b08
8241307: Marlin renderer should not be the default in 8u252
Reviewed-by: phh, alexsch, andrew, sgehwolf
author | lbourges |
---|---|
date | Wed, 25 Mar 2020 03:53:05 +0000 |
parents | 8efdcbf79b11 |
children | da301ecaa81d |
files | src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine src/solaris/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine test/sun/java2d/marlin/DefaultRenderingEngine.java |
diffstat | 3 files changed, 53 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine Fri Mar 20 14:26:26 2020 +0000 +++ b/src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine Wed Mar 25 03:53:05 2020 +0000 @@ -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
--- a/src/solaris/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine Fri Mar 20 14:26:26 2020 +0000 +++ b/src/solaris/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine Wed Mar 25 03:53:05 2020 +0000 @@ -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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/sun/java2d/marlin/DefaultRenderingEngine.java Wed Mar 25 03:53:05 2020 +0000 @@ -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 !"); + } + } +}