--- old/jdk/src/java.desktop/share/classes/sun/java2d/marlin/MarlinProperties.java	2016-11-09 23:01:54.798698282 +0100
+++ /dev/null	2016-11-09 21:11:53.331285646 +0100
@@ -1,203 +0,0 @@
-/*
- * Copyright (c) 2007, 2015, 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
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-package sun.java2d.marlin;
-
-import java.security.AccessController;
-import static sun.java2d.marlin.MarlinUtils.logInfo;
-import sun.security.action.GetPropertyAction;
-
-public final class MarlinProperties {
-
-    private MarlinProperties() {
-        // no-op
-    }
-
-    // marlin system properties
-
-    public static boolean isUseThreadLocal() {
-        return getBoolean("sun.java2d.renderer.useThreadLocal", "true");
-    }
-
-    /**
-     * Return the initial edge capacity used to define initial arrays
-     * (edges, polystack, crossings)
-     *
-     * @return 256 < initial edges < 65536 (4096 by default)
-     */
-    public static int getInitialEdges() {
-        return align(
-            getInteger("sun.java2d.renderer.edges", 4096, 64, 64 * 1024),
-            64);
-    }
-
-    /**
-     * Return the initial pixel size used to define initial arrays
-     * (tile AA chunk, alpha line, buckets)
-     *
-     * @return 64 < initial pixel size < 32768 (2048 by default)
-     */
-    public static int getInitialImageSize() {
-        return align(
-            getInteger("sun.java2d.renderer.pixelsize", 2048, 64, 32 * 1024),
-            64);
-    }
-
-    /**
-     * Return the log(2) corresponding to subpixel on x-axis (
-     *
-     * @return 1 (2 subpixels) < initial pixel size < 4 (256 subpixels)
-     * (3 by default ie 8 subpixels)
-     */
-    public static int getSubPixel_Log2_X() {
-        return getInteger("sun.java2d.renderer.subPixel_log2_X", 3, 1, 8);
-    }
-
-    /**
-     * Return the log(2) corresponding to subpixel on y-axis (
-     *
-     * @return 1 (2 subpixels) < initial pixel size < 8 (256 subpixels)
-     * (3 by default ie 8 subpixels)
-     */
-    public static int getSubPixel_Log2_Y() {
-        return getInteger("sun.java2d.renderer.subPixel_log2_Y", 3, 1, 8);
-    }
-
-    /**
-     * Return the log(2) corresponding to the square tile size in pixels
-     *
-     * @return 3 (8x8 pixels) < tile size < 8 (256x256 pixels)
-     * (5 by default ie 32x32 pixels)
-     */
-    public static int getTileSize_Log2() {
-        return getInteger("sun.java2d.renderer.tileSize_log2", 5, 3, 8);
-    }
-
-    /**
-     * Return the log(2) corresponding to the block size in pixels
-     *
-     * @return 3 (8 pixels) < block size < 8 (256 pixels)
-     * (5 by default ie 32 pixels)
-     */
-    public static int getBlockSize_Log2() {
-        return getInteger("sun.java2d.renderer.blockSize_log2", 5, 3, 8);
-    }
-
-    // RLE / blockFlags settings
-
-    public static boolean isForceRLE() {
-        return getBoolean("sun.java2d.renderer.forceRLE", "false");
-    }
-
-    public static boolean isForceNoRLE() {
-        return getBoolean("sun.java2d.renderer.forceNoRLE", "false");
-    }
-
-    public static boolean isUseTileFlags() {
-        return getBoolean("sun.java2d.renderer.useTileFlags", "true");
-    }
-
-    public static boolean isUseTileFlagsWithHeuristics() {
-        return isUseTileFlags()
-        && getBoolean("sun.java2d.renderer.useTileFlags.useHeuristics", "true");
-    }
-
-    public static int getRLEMinWidth() {
-        return getInteger("sun.java2d.renderer.rleMinWidth", 64, 0, Integer.MAX_VALUE);
-    }
-
-    // optimisation parameters
-
-    public static boolean isUseSimplifier() {
-        return getBoolean("sun.java2d.renderer.useSimplifier", "false");
-    }
-
-    // debugging parameters
-
-    public static boolean isDoStats() {
-        return getBoolean("sun.java2d.renderer.doStats", "false");
-    }
-
-    public static boolean isDoMonitors() {
-        return getBoolean("sun.java2d.renderer.doMonitors", "false");
-    }
-
-    public static boolean isDoChecks() {
-        return getBoolean("sun.java2d.renderer.doChecks", "false");
-    }
-
-    // logging parameters
-
-    public static boolean isLoggingEnabled() {
-        return getBoolean("sun.java2d.renderer.log", "false");
-    }
-
-    public static boolean isUseLogger() {
-        return getBoolean("sun.java2d.renderer.useLogger", "false");
-    }
-
-    public static boolean isLogCreateContext() {
-        return getBoolean("sun.java2d.renderer.logCreateContext", "false");
-    }
-
-    public static boolean isLogUnsafeMalloc() {
-        return getBoolean("sun.java2d.renderer.logUnsafeMalloc", "false");
-    }
-
-    // system property utilities
-    static boolean getBoolean(final String key, final String def) {
-        return Boolean.valueOf(AccessController.doPrivileged(
-                  new GetPropertyAction(key, def)));
-    }
-
-    static int getInteger(final String key, final int def,
-                                 final int min, final int max)
-    {
-        final String property = AccessController.doPrivileged(
-                                    new GetPropertyAction(key));
-
-        int value = def;
-        if (property != null) {
-            try {
-                value = Integer.decode(property);
-            } catch (NumberFormatException e) {
-                logInfo("Invalid integer value for " + key + " = " + property);
-            }
-        }
-
-        // check for invalid values
-        if ((value < min) || (value > max)) {
-            logInfo("Invalid value for " + key + " = " + value
-                    + "; expected value in range[" + min + ", " + max + "] !");
-            value = def;
-        }
-        return value;
-    }
-
-    static int align(final int val, final int norm) {
-        final int ceil = FloatMath.ceil_int( ((float)val) / norm);
-        return ceil * norm;
-    }
-}
--- /dev/null	2016-11-09 21:11:53.331285646 +0100
+++ new/openjfx9/modules/javafx.graphics/src/main/java/com/sun/marlin/MarlinProperties.java	2016-11-09 23:01:54.670698733 +0100
@@ -0,0 +1,210 @@
+/*
+ * Copyright (c) 2015, 2016, 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
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+package com.sun.marlin;
+
+import java.security.AccessController;
+import static com.sun.marlin.MarlinUtils.logInfo;
+import java.security.PrivilegedAction;
+
+public final class MarlinProperties {
+
+    private MarlinProperties() {
+        // no-op
+    }
+
+    // marlin system properties
+
+    public static boolean isUseThreadLocal() {
+        return getBoolean("prism.marlin.useThreadLocal", "true");
+    }
+
+    /**
+     * Return the initial edge capacity used to define initial arrays
+     * (edges, polystack, crossings)
+     *
+     * @return 256 < initial edges < 65536 (4096 by default)
+     */
+    public static int getInitialEdges() {
+        return align(
+            getInteger("prism.marlin.edges", 4096, 64, 64 * 1024),
+            64);
+    }
+
+    /**
+     * Return the initial pixel size used to define initial arrays
+     * (tile AA chunk, alpha line, buckets)
+     *
+     * @return 64 < initial pixel size < 32768 (2048 by default)
+     */
+    public static int getInitialImageSize() {
+        return align(
+            getInteger("prism.marlin.pixelsize", 2048, 64, 32 * 1024),
+            64);
+    }
+
+    /**
+     * Return the log(2) corresponding to subpixel on x-axis (
+     *
+     * @return 0 (1 subpixels) < initial pixel size < 4 (256 subpixels)
+     * (3 by default ie 8 subpixels)
+     */
+    public static int getSubPixel_Log2_X() {
+        return getInteger("prism.marlin.subPixel_log2_X", 3, 0, 8);
+    }
+
+    /**
+     * Return the log(2) corresponding to subpixel on y-axis (
+     *
+     * @return 0 (1 subpixels) < initial pixel size < 8 (256 subpixels)
+     * (3 by default ie 8 subpixels)
+     */
+    public static int getSubPixel_Log2_Y() {
+        return getInteger("prism.marlin.subPixel_log2_Y", 3, 0, 8);
+    }
+
+    /**
+     * Return the log(2) corresponding to the square tile size in pixels
+     *
+     * @return 3 (8x8 pixels) < tile size < 8 (256x256 pixels)
+     * (5 by default ie 32x32 pixels)
+     */
+    public static int getTileSize_Log2() {
+        return getInteger("prism.marlin.tileSize_log2", 5, 3, 8);
+    }
+
+    public static int getTileWidth_Log2() {
+        return getInteger("prism.marlin.tileWidth_log2", 5, 3, 10);
+    }
+
+    /**
+     * Return the log(2) corresponding to the block size in pixels
+     *
+     * @return 3 (8 pixels) < block size < 8 (256 pixels)
+     * (5 by default ie 32 pixels)
+     */
+    public static int getBlockSize_Log2() {
+        return getInteger("prism.marlin.blockSize_log2", 5, 3, 8);
+    }
+
+    // RLE / blockFlags settings
+
+    public static boolean isForceRLE() {
+        return getBoolean("prism.marlin.forceRLE", "false");
+    }
+
+    public static boolean isForceNoRLE() {
+        return getBoolean("prism.marlin.forceNoRLE", "false");
+    }
+
+    public static boolean isUseTileFlags() {
+        return getBoolean("prism.marlin.useTileFlags", "true");
+    }
+
+    public static boolean isUseTileFlagsWithHeuristics() {
+        return isUseTileFlags()
+        && getBoolean("prism.marlin.useTileFlags.useHeuristics", "true");
+    }
+
+    public static int getRLEMinWidth() {
+        return getInteger("prism.marlin.rleMinWidth", 64, 0, Integer.MAX_VALUE);
+    }
+
+    // optimisation parameters
+
+    public static boolean isUseSimplifier() {
+        return getBoolean("prism.marlin.useSimplifier", "false");
+    }
+
+    // debugging parameters
+
+    public static boolean isDoStats() {
+        return getBoolean("prism.marlin.doStats", "false");
+    }
+
+    public static boolean isDoMonitors() {
+        return getBoolean("prism.marlin.doMonitors", "false");
+    }
+
+    public static boolean isDoChecks() {
+        return getBoolean("prism.marlin.doChecks", "false");
+    }
+
+    // logging parameters
+
+    public static boolean isLoggingEnabled() {
+        return getBoolean("prism.marlin.log", "false");
+    }
+
+    public static boolean isUseLogger() {
+        return getBoolean("prism.marlin.useLogger", "false");
+    }
+
+    public static boolean isLogCreateContext() {
+        return getBoolean("prism.marlin.logCreateContext", "false");
+    }
+
+    public static boolean isLogUnsafeMalloc() {
+        return getBoolean("prism.marlin.logUnsafeMalloc", "false");
+    }
+
+    // system property utilities
+    static boolean getBoolean(final String key, final String def) {
+        return Boolean.valueOf(AccessController.doPrivileged(
+            (PrivilegedAction<String>) () -> {
+                String value = System.getProperty(key);
+                return (value == null) ? def : value;
+            }));
+    }
+
+    static int getInteger(final String key, final int def,
+                                 final int min, final int max)
+    {
+        final String property = AccessController.doPrivileged(
+                    (PrivilegedAction<String>) () -> System.getProperty(key));
+
+        int value = def;
+        if (property != null) {
+            try {
+                value = Integer.decode(property);
+            } catch (NumberFormatException e) {
+                logInfo("Invalid integer value for " + key + " = " + property);
+            }
+        }
+
+        // check for invalid values
+        if ((value < min) || (value > max)) {
+            logInfo("Invalid value for " + key + " = " + value
+                    + "; expected value in range[" + min + ", " + max + "] !");
+            value = def;
+        }
+        return value;
+    }
+
+    static int align(final int val, final int norm) {
+        final int ceil = FloatMath.ceil_int( ((float)val) / norm);
+        return ceil * norm;
+    }
+}