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

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

@@ -170,11 +176,11 @@
             x = new DoublePropertyBase() {
 
                 @Override
                 public void invalidated() {
                     NodeHelper.markDirty(Rectangle.this, DirtyBits.NODE_GEOMETRY);
-                    impl_geomChanged();
+                    NodeHelper.geomChanged(Rectangle.this);
                 }
 
                 @Override
                 public Object getBean() {
                     return Rectangle.this;

@@ -211,11 +217,11 @@
             y = new DoublePropertyBase() {
 
                 @Override
                 public void invalidated() {
                     NodeHelper.markDirty(Rectangle.this, DirtyBits.NODE_GEOMETRY);
-                    impl_geomChanged();
+                    NodeHelper.geomChanged(Rectangle.this);
                 }
 
                 @Override
                 public Object getBean() {
                     return Rectangle.this;

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

@@ -274,11 +280,11 @@
     private final DoubleProperty height = new DoublePropertyBase() {
 
         @Override
         public void invalidated() {
             NodeHelper.markDirty(Rectangle.this, DirtyBits.NODE_GEOMETRY);
-            impl_geomChanged();
+            NodeHelper.geomChanged(Rectangle.this);
         }
 
         @Override
         public Object getBean() {
             return Rectangle.this;

@@ -502,17 +508,14 @@
             return StrokeLineJoin.BEVEL;
         }
         return t;
     }
 
-    /**
-     * @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();