modules/graphics/src/main/java/javafx/scene/shape/Ellipse.java

@@ -68,10 +68,16 @@
             public void doUpdatePeer(Node node) {
                 ((Ellipse) node).doUpdatePeer();
             }
 
             @Override
+            public BaseBounds doComputeGeomBounds(Node node,
+            BaseBounds bounds, BaseTransform tx) {
+                return ((Ellipse) node).doComputeGeomBounds(bounds, tx);
+            }
+
+            @Override
             public com.sun.javafx.geom.Shape doConfigShape(Shape shape) {
                 return ((Ellipse) shape).doConfigShape();
             }
         });
     }

@@ -140,11 +146,11 @@
             centerX = new DoublePropertyBase() {
 
                 @Override
                 public void invalidated() {
                     NodeHelper.markDirty(Ellipse.this, DirtyBits.NODE_GEOMETRY);
-                    impl_geomChanged();
+                    NodeHelper.geomChanged(Ellipse.this);
                 }
 
                 @Override
                 public Object getBean() {
                     return Ellipse.this;

@@ -181,11 +187,11 @@
             centerY = new DoublePropertyBase() {
 
                 @Override
                 public void invalidated() {
                     NodeHelper.markDirty(Ellipse.this, DirtyBits.NODE_GEOMETRY);
-                    impl_geomChanged();
+                    NodeHelper.geomChanged(Ellipse.this);
                 }
 
                 @Override
                 public Object getBean() {
                     return Ellipse.this;

@@ -208,11 +214,11 @@
     private final DoubleProperty radiusX = new DoublePropertyBase() {
 
         @Override
         public void invalidated() {
             NodeHelper.markDirty(Ellipse.this, DirtyBits.NODE_GEOMETRY);
-            impl_geomChanged();
+            NodeHelper.geomChanged(Ellipse.this);
         }
 
         @Override
         public Object getBean() {
             return Ellipse.this;

@@ -244,11 +250,11 @@
     private final DoubleProperty radiusY = new DoublePropertyBase() {
 
         @Override
         public void invalidated() {
             NodeHelper.markDirty(Ellipse.this, DirtyBits.NODE_GEOMETRY);
-            impl_geomChanged();
+            NodeHelper.geomChanged(Ellipse.this);
         }
 
         @Override
         public Object getBean() {
             return Ellipse.this;

@@ -293,17 +299,14 @@
         // anomalous angles and is the simplest join style to compute in
         // the stroking code.
         return StrokeLineJoin.BEVEL;
     }
 
-    /**
-     * @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
-    @Override
-    public BaseBounds impl_computeGeomBounds(BaseBounds bounds, BaseTransform tx) {
+    private BaseBounds doComputeGeomBounds(BaseBounds bounds, BaseTransform tx) {
         // if there is no fill or stroke, then there are no bounds. The bounds
         // must be marked empty in this case to distinguish it from 0,0,0,0
         // which would actually contribute to the bounds of a group.
         if (getMode() == NGShape.Mode.EMPTY) {
             return bounds.makeEmpty();