--- old/modules/graphics/src/main/java/javafx/scene/canvas/GraphicsContext.java	2016-04-29 10:54:55.661349500 -0700
+++ new/modules/graphics/src/main/java/javafx/scene/canvas/GraphicsContext.java	2016-04-29 10:54:55.323058600 -0700
@@ -35,6 +35,7 @@
 import com.sun.javafx.image.impl.ByteBgraPre;
 import com.sun.javafx.sg.prism.GrowableDataBuffer;
 import com.sun.javafx.sg.prism.NGCanvas;
+import com.sun.javafx.text.FontHelper;
 import com.sun.javafx.tk.Toolkit;
 import com.sun.scenario.effect.EffectHelper;
 import javafx.geometry.NodeOrientation;
@@ -748,7 +749,7 @@
                             double dx, double dy, double dw, double dh)
     {
         if (img == null || img.getProgress() < 1.0) return;
-        Object platformImg = img.impl_getPlatformImage();
+        Object platformImg = Toolkit.getImageAccessor().getPlatformImage(img);
         if (platformImg == null) return;
         updateTransform();
         GrowableDataBuffer buf = getBuffer();
@@ -761,7 +762,7 @@
                             double sx, double sy, double sw, double sh)
     {
         if (img == null || img.getProgress() < 1.0) return;
-        Object platformImg = img.impl_getPlatformImage();
+        Object platformImg = Toolkit.getImageAccessor().getPlatformImage(img);
         if (platformImg == null) return;
         updateTransform();
         GrowableDataBuffer buf = getBuffer();
@@ -1131,7 +1132,7 @@
             GrowableDataBuffer buf = getBuffer();
             curState.blendop = op;
             buf.putByte(NGCanvas.COMP_MODE);
-            buf.putObject(Blend.impl_getToolkitMode(op));
+            buf.putObject(EffectHelper.getToolkitBlendMode(op));
         }
     }
 
@@ -1482,7 +1483,7 @@
             curState.font = f;
             GrowableDataBuffer buf = getBuffer();
             buf.putByte(NGCanvas.FONT);
-            buf.putObject(f.impl_getNativeFont());
+            buf.putObject(FontHelper.getNativeFont(f));
         }
     }