--- old/modules/graphics/src/main/java/com/sun/javafx/css/FontFace.java	2015-09-03 15:30:54.263052400 -0700
+++ /dev/null	2015-09-03 15:30:55.000000000 -0700
@@ -1,178 +0,0 @@
-/*
- * Copyright (c) 2011, 2014, 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.javafx.css;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * A FontFace is a @font-face definition from CSS file
- */
-final public class FontFace {
-    public static enum FontFaceSrcType {URL,LOCAL, REFERENCE}
-
-    private final Map<String,String> descriptors;
-    private final List<FontFaceSrc> sources;
-
-    public FontFace(Map<String, String> descriptors, List<FontFaceSrc> sources) {
-        this.descriptors = descriptors;
-        this.sources = sources;
-    }
-
-    public Map<String, String> getDescriptors() {
-        return descriptors;
-    }
-
-    public List<FontFaceSrc> getSources() {
-        return sources;
-    }
-
-    @Override public String toString() {
-        StringBuilder sb = new StringBuilder("@font-face { ");
-        for(Map.Entry<String,String> desc: descriptors.entrySet()) {
-            sb.append(desc.getKey());
-            sb.append(" : ");
-            sb.append(desc.getValue());
-            sb.append("; ");
-        }
-        sb.append("src : ");
-        for(FontFaceSrc src: sources) {
-            sb.append(src.getType());
-            sb.append(" \"");
-            sb.append(src.getSrc());
-            sb.append("\", ");
-        }
-        sb.append("; ");
-        sb.append(" }");
-        return sb.toString();
-    }
-
-    final void writeBinary(final DataOutputStream os, final StringStore stringStore) throws IOException
-    {
-        Set<Map.Entry<String,String>> entrySet = getDescriptors() != null ? getDescriptors().entrySet() : null;
-        int nEntries = entrySet != null ? entrySet.size() : 0;
-        os.writeShort(nEntries);
-        if (entrySet != null) {
-            for(Map.Entry<String,String> entry : entrySet) {
-                int index = stringStore.addString(entry.getKey());
-                os.writeInt(index);
-                index = stringStore.addString(entry.getValue());
-                os.writeInt(index);
-            }
-        }
-
-        List<FontFaceSrc> fontFaceSrcs = getSources();
-        nEntries = fontFaceSrcs != null ? fontFaceSrcs.size() : 0;
-        os.writeShort(nEntries);
-        for (int n=0; n<nEntries; n++) {
-            FontFaceSrc fontFaceSrc = fontFaceSrcs.get(n);
-            fontFaceSrc.writeBinary(os, stringStore);
-        }
-
-    }
-
-    final static FontFace readBinary(int bssVersion, DataInputStream is, String[] strings) throws IOException
-    {
-        int nEntries = is.readShort();
-        Map<String,String> descriptors = new HashMap(nEntries);
-        for (int n=0; n<nEntries; n++) {
-            int index = is.readInt();
-            String key = strings[index];
-            index = is.readInt();
-            String value = strings[index];
-            descriptors.put(key, value);
-        }
-
-        nEntries = is.readShort();
-        List<FontFaceSrc> fontFaceSrcs = new ArrayList<>(nEntries);
-        for (int n=0; n<nEntries; n++) {
-            FontFaceSrc fontFaceSrc = FontFaceSrc.readBinary(bssVersion, is, strings);
-            fontFaceSrcs.add(fontFaceSrc);
-        }
-
-        return new FontFace(descriptors, fontFaceSrcs);
-
-    }
-
-    public static class FontFaceSrc {
-        private final FontFaceSrcType type;
-        private final String src;
-        private final String format;
-
-        public FontFaceSrc(FontFaceSrcType type, String src, String format) {
-            this.type = type;
-            this.src = src;
-            this.format = format;
-        }
-
-        public FontFaceSrc(FontFaceSrcType type, String src) {
-            this.type = type;
-            this.src = src;
-            this.format = null;
-        }
-
-        public FontFaceSrcType getType() {
-            return type;
-        }
-
-        public String getSrc() {
-            return src;
-        }
-
-        public String getFormat() {
-            return format;
-        }
-
-        final void writeBinary(final DataOutputStream os, final StringStore stringStore) throws IOException
-        {
-            // ok if type, src or format are null since StringStore allows null
-            os.writeInt(stringStore.addString(type.name()));
-            os.writeInt(stringStore.addString(src));
-            os.writeInt(stringStore.addString(format));
-        }
-
-        final static FontFaceSrc readBinary(int bssVersion, DataInputStream is, String[] strings) throws IOException
-        {
-            int index = is.readInt();
-            FontFaceSrcType type = (strings[index] != null) ? FontFaceSrcType.valueOf(strings[index]) : null;
-
-            index = is.readInt();
-            String src = strings[index];
-
-            index = is.readInt();
-            String format = strings[index];
-
-            return new FontFaceSrc(type, src, format);
-
-        }
-    }
-}
--- /dev/null	2015-09-03 15:30:55.000000000 -0700
+++ new/modules/graphics/src/main/java/com/sun/javafx/css/FontFaceImpl.java	2015-09-03 15:30:53.525010200 -0700
@@ -0,0 +1,180 @@
+/*
+ * Copyright (c) 2011, 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 com.sun.javafx.css;
+
+import javafx.css.FontFace;
+import javafx.css.StyleConverter.StringStore;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * A FontFace is a @font-face definition from CSS file
+ */
+final public class FontFaceImpl extends FontFace {
+    public static enum FontFaceSrcType {URL,LOCAL, REFERENCE}
+
+    private final Map<String,String> descriptors;
+    private final List<FontFaceSrc> sources;
+
+    public FontFaceImpl(Map<String, String> descriptors, List<FontFaceSrc> sources) {
+        this.descriptors = descriptors;
+        this.sources = sources;
+    }
+
+    public Map<String, String> getDescriptors() {
+        return descriptors;
+    }
+
+    public List<FontFaceSrc> getSources() {
+        return sources;
+    }
+
+    @Override public String toString() {
+        StringBuilder sb = new StringBuilder("@font-face { ");
+        for(Map.Entry<String,String> desc: descriptors.entrySet()) {
+            sb.append(desc.getKey());
+            sb.append(" : ");
+            sb.append(desc.getValue());
+            sb.append("; ");
+        }
+        sb.append("src : ");
+        for(FontFaceSrc src: sources) {
+            sb.append(src.getType());
+            sb.append(" \"");
+            sb.append(src.getSrc());
+            sb.append("\", ");
+        }
+        sb.append("; ");
+        sb.append(" }");
+        return sb.toString();
+    }
+
+    public final void writeBinary(final DataOutputStream os, final StringStore stringStore) throws IOException
+    {
+        Set<Map.Entry<String,String>> entrySet = getDescriptors() != null ? getDescriptors().entrySet() : null;
+        int nEntries = entrySet != null ? entrySet.size() : 0;
+        os.writeShort(nEntries);
+        if (entrySet != null) {
+            for(Map.Entry<String,String> entry : entrySet) {
+                int index = stringStore.addString(entry.getKey());
+                os.writeInt(index);
+                index = stringStore.addString(entry.getValue());
+                os.writeInt(index);
+            }
+        }
+
+        List<FontFaceSrc> fontFaceSrcs = getSources();
+        nEntries = fontFaceSrcs != null ? fontFaceSrcs.size() : 0;
+        os.writeShort(nEntries);
+        for (int n=0; n<nEntries; n++) {
+            FontFaceSrc fontFaceSrc = fontFaceSrcs.get(n);
+            fontFaceSrc.writeBinary(os, stringStore);
+        }
+
+    }
+
+    public final static FontFaceImpl readBinary(int bssVersion, DataInputStream is, String[] strings) throws IOException
+    {
+        int nEntries = is.readShort();
+        Map<String,String> descriptors = new HashMap(nEntries);
+        for (int n=0; n<nEntries; n++) {
+            int index = is.readInt();
+            String key = strings[index];
+            index = is.readInt();
+            String value = strings[index];
+            descriptors.put(key, value);
+        }
+
+        nEntries = is.readShort();
+        List<FontFaceSrc> fontFaceSrcs = new ArrayList<>(nEntries);
+        for (int n=0; n<nEntries; n++) {
+            FontFaceSrc fontFaceSrc = FontFaceSrc.readBinary(bssVersion, is, strings);
+            fontFaceSrcs.add(fontFaceSrc);
+        }
+
+        return new FontFaceImpl(descriptors, fontFaceSrcs);
+    }
+
+    public static class FontFaceSrc {
+        private final FontFaceSrcType type;
+        private final String src;
+        private final String format;
+
+        public FontFaceSrc(FontFaceSrcType type, String src, String format) {
+            this.type = type;
+            this.src = src;
+            this.format = format;
+        }
+
+        public FontFaceSrc(FontFaceSrcType type, String src) {
+            this.type = type;
+            this.src = src;
+            this.format = null;
+        }
+
+        public FontFaceSrcType getType() {
+            return type;
+        }
+
+        public String getSrc() {
+            return src;
+        }
+
+        public String getFormat() {
+            return format;
+        }
+
+        final void writeBinary(final DataOutputStream os, final StringStore stringStore) throws IOException
+        {
+            // ok if type, src or format are null since StringStore allows null
+            os.writeInt(stringStore.addString(type.name()));
+            os.writeInt(stringStore.addString(src));
+            os.writeInt(stringStore.addString(format));
+        }
+
+        final static FontFaceSrc readBinary(int bssVersion, DataInputStream is, String[] strings) throws IOException
+        {
+            int index = is.readInt();
+            FontFaceSrcType type = (strings[index] != null) ? FontFaceSrcType.valueOf(strings[index]) : null;
+
+            index = is.readInt();
+            String src = strings[index];
+
+            index = is.readInt();
+            String format = strings[index];
+
+            return new FontFaceSrc(type, src, format);
+
+        }
+    }
+}