modules/graphics/src/main/java/com/sun/javafx/scene/shape/ShapeHelper.java

*** 23,32 ****
--- 23,36 ----
   * questions.
   */
  
  package com.sun.javafx.scene.shape;
  
+ import com.sun.javafx.geom.BaseBounds;
+ import com.sun.javafx.geom.transform.BaseTransform;
+ import com.sun.javafx.jmx.MXNodeAlgorithm;
+ import com.sun.javafx.jmx.MXNodeAlgorithmContext;
  import com.sun.javafx.scene.DirtyBits;
  import com.sun.javafx.scene.NodeHelper;
  import com.sun.javafx.sg.prism.NGNode;
  import com.sun.javafx.sg.prism.NGShape;
  import com.sun.javafx.util.Utils;
*** 76,85 ****
--- 80,105 ----
      protected void markDirtyImpl(Node node, DirtyBits dirtyBit) {
          shapeAccessor.doMarkDirty(node, dirtyBit);
          super.markDirtyImpl(node, dirtyBit);
      }
  
+     @Override
+     protected BaseBounds computeGeomBoundsImpl(Node node, BaseBounds bounds,
+             BaseTransform tx) {
+         return shapeAccessor.doComputeGeomBounds(node, bounds, tx);
+     }
+ 
+     @Override
+     protected boolean computeContainsImpl(Node node, double localX, double localY) {
+         return shapeAccessor.doComputeContains(node, localX, localY);
+     }
+ 
+     @Override
+     protected Object processMXNodeImpl(Node node, MXNodeAlgorithm alg, MXNodeAlgorithmContext ctx) {
+         return shapeAccessor.doProcessMXNode(node, alg, ctx);
+     }
+ 
      protected Paint cssGetFillInitialValueImpl(Shape shape) {
          return shapeAccessor.doCssGetFillInitialValue(shape);
      }
  
      protected Paint cssGetStrokeInitialValueImpl(Shape shape) {
*** 113,122 ****
--- 133,145 ----
      }
  
      public interface ShapeAccessor {
          void doUpdatePeer(Node node);
          void doMarkDirty(Node node, DirtyBits dirtyBit);
+         BaseBounds doComputeGeomBounds(Node node, BaseBounds bounds, BaseTransform tx);
+         boolean doComputeContains(Node node, double localX, double localY);
+         Object doProcessMXNode(Node node, MXNodeAlgorithm alg, MXNodeAlgorithmContext ctx);
          Paint doCssGetFillInitialValue(Shape shape);
          Paint doCssGetStrokeInitialValue(Shape shape);
          NGShape.Mode getMode(Shape shape);
          void setMode(Shape shape, NGShape.Mode mode);
          void setShapeChangeListener(Shape shape, Runnable listener);