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

*** 131,140 ****
--- 131,156 ----
              public void doMarkDirty(Node node, DirtyBits dirtyBit) {
                  ((Shape) node).doMarkDirty(dirtyBit);
              }
  
              @Override
+             public BaseBounds doComputeGeomBounds(Node node,
+             BaseBounds bounds, BaseTransform tx) {
+                 return ((Shape) node).doComputeGeomBounds(bounds, tx);
+             }
+ 
+             @Override
+             public boolean doComputeContains(Node node, double localX, double localY) {
+                 return ((Shape) node).doComputeContains(localX, localY);
+             }
+ 
+             @Override
+             public Object doProcessMXNode(Node node, MXNodeAlgorithm alg, MXNodeAlgorithmContext ctx) {
+                 return ((Shape) node).doProcessMXNode(alg, ctx);
+             }
+ 
+             @Override
              public Paint doCssGetFillInitialValue(Shape shape) {
                  return shape.doCssGetFillInitialValue();
              }
  
              @Override
*** 389,399 ****
          NGShape.Mode newMode = computeMode();
          if (mode != newMode) {
              mode = newMode;
  
              NodeHelper.markDirty(this, DirtyBits.SHAPE_MODE);
!             impl_geomChanged();
          }
      }
  
      /**
       * Defines parameters to fill the interior of an {@code Shape}
--- 405,415 ----
          NGShape.Mode newMode = computeMode();
          if (mode != newMode) {
              mode = newMode;
  
              NodeHelper.markDirty(this, DirtyBits.SHAPE_MODE);
!             NodeHelper.geomChanged(this);
          }
      }
  
      /**
       * Defines parameters to fill the interior of an {@code Shape}
*** 478,488 ****
              new AbstractNotifyListener() {
          @Override
          public void invalidated(Observable valueModel) {
              NodeHelper.markDirty(Shape.this, DirtyBits.SHAPE_FILL);
              NodeHelper.markDirty(Shape.this, DirtyBits.SHAPE_STROKE);
!             impl_geomChanged();
              checkModeChanged();
          }
      };
  
      public final Paint getStroke() {
--- 494,504 ----
              new AbstractNotifyListener() {
          @Override
          public void invalidated(Observable valueModel) {
              NodeHelper.markDirty(Shape.this, DirtyBits.SHAPE_FILL);
              NodeHelper.markDirty(Shape.this, DirtyBits.SHAPE_STROKE);
!             NodeHelper.geomChanged(Shape.this);
              checkModeChanged();
          }
      };
  
      public final Paint getStroke() {
*** 888,915 ****
      @Override
      public List<CssMetaData<? extends Styleable, ?>> getCssMetaData() {
          return getClassCssMetaData();
      }
  
!     /**
!      * @treatAsPrivate implementation detail
!      * @deprecated This is an internal API that is not intended for use and will be removed in the next version
       */
!     @Deprecated
!     @Override
!     public BaseBounds impl_computeGeomBounds(BaseBounds bounds,
                                               BaseTransform tx) {
          return computeShapeBounds(bounds, tx, ShapeHelper.configShape(this));
      }
  
!     /**
!      * @treatAsPrivate implementation detail
!      * @deprecated This is an internal API that is not intended for use and will be removed in the next version
       */
!     @Deprecated
!     @Override
!     protected boolean impl_computeContains(double localX, double localY) {
          return computeShapeContains(localX, localY, ShapeHelper.configShape(this));
      }
  
      private static final double MIN_STROKE_WIDTH = 0.0f;
      private static final double MIN_STROKE_MITER_LIMIT = 1.0f;
--- 904,925 ----
      @Override
      public List<CssMetaData<? extends Styleable, ?>> getCssMetaData() {
          return getClassCssMetaData();
      }
  
!     /*
!      * Note: This method MUST only be called via its accessor method.
       */
!     private BaseBounds doComputeGeomBounds(BaseBounds bounds,
                                               BaseTransform tx) {
          return computeShapeBounds(bounds, tx, ShapeHelper.configShape(this));
      }
  
!     /*
!      * Note: This method MUST only be called via its accessor method.
       */
!     private boolean doComputeContains(double localX, double localY) {
          return computeShapeContains(localX, localY, ShapeHelper.configShape(this));
      }
  
      private static final double MIN_STROKE_WIDTH = 0.0f;
      private static final double MIN_STROKE_MITER_LIMIT = 1.0f;
*** 1513,1534 ****
              NodeHelper.markDirty(Shape.this, DirtyBits.SHAPE_STROKEATTRS);
              strokeAttributesDirty = true;
              if (propertyCssKey != StyleableProperties.STROKE_DASH_OFFSET) {
                  // all stroke attributes change geometry except for the
                  // stroke dash offset
!                 impl_geomChanged();
              }
          }
      }
  
!     /**
!      * @treatAsPrivate implementation detail
!      * @deprecated This is an internal API that is not intended for use and will be removed in the next version
       */
!     @Deprecated
!     @Override
!     public Object impl_processMXNode(MXNodeAlgorithm alg, MXNodeAlgorithmContext ctx) {
          return alg.processLeafNode(this, ctx);
      }
  
      // PENDING_DOC_REVIEW
      /**
--- 1523,1541 ----
              NodeHelper.markDirty(Shape.this, DirtyBits.SHAPE_STROKEATTRS);
              strokeAttributesDirty = true;
              if (propertyCssKey != StyleableProperties.STROKE_DASH_OFFSET) {
                  // all stroke attributes change geometry except for the
                  // stroke dash offset
!                 NodeHelper.geomChanged(Shape.this);
              }
          }
      }
  
!     /*
!      * Note: This method MUST only be called via its accessor method.
       */
!     private Object doProcessMXNode(MXNodeAlgorithm alg, MXNodeAlgorithmContext ctx) {
          return alg.processLeafNode(this, ctx);
      }
  
      // PENDING_DOC_REVIEW
      /**
*** 1714,1724 ****
      private static BaseTransform calculateNodeToSceneTransform(Node node) {
          final Affine3D cumulativeTransformation = new Affine3D();
  
          do {
              cumulativeTransformation.preConcatenate(
!                     node.impl_getLeafTransform());
              node = node.getParent();
          } while (node != null);
  
          return cumulativeTransformation;
      }
--- 1721,1731 ----
      private static BaseTransform calculateNodeToSceneTransform(Node node) {
          final Affine3D cumulativeTransformation = new Affine3D();
  
          do {
              cumulativeTransformation.preConcatenate(
!                     NodeHelper.getLeafTransform(node));
              node = node.getParent();
          } while (node != null);
  
          return cumulativeTransformation;
      }