--- old/modules/graphics/src/main/java/javafx/scene/shape/Polygon.java	2016-06-03 11:04:34.353423247 -0700
+++ new/modules/graphics/src/main/java/javafx/scene/shape/Polygon.java	2016-06-03 11:04:34.209423249 -0700
@@ -71,6 +71,12 @@
             }
 
             @Override
+            public BaseBounds doComputeGeomBounds(Node node,
+            BaseBounds bounds, BaseTransform tx) {
+                return ((Polygon) node).doComputeGeomBounds(bounds, tx);
+            }
+
+            @Override
             public com.sun.javafx.geom.Shape doConfigShape(Shape shape) {
                 return ((Polygon) shape).doConfigShape();
             }
@@ -111,7 +117,7 @@
         @Override
         protected void onChanged(Change<Double> c) {
             NodeHelper.markDirty(Polygon.this, DirtyBits.NODE_GEOMETRY);
-            impl_geomChanged();
+            NodeHelper.geomChanged(Polygon.this);
         }
     };
 
@@ -128,12 +134,10 @@
         return new NGPolygon();
     }
 
-    /**
-     * @treatAsPrivate implementation detail
-     * @deprecated This is an internal API that is not intended for use and will be removed in the next version
+    /*
+     * Note: This method MUST only be called via its accessor method.
      */
-    @Deprecated
-    public BaseBounds impl_computeGeomBounds(BaseBounds bounds, BaseTransform tx) {
+    private BaseBounds doComputeGeomBounds(BaseBounds bounds, BaseTransform tx) {
         if (getMode() == NGShape.Mode.EMPTY || getPoints().size() <= 1) {
             return bounds.makeEmpty();
         }