--- old/modules/graphics/src/test/java/test/javafx/scene/bounds/ResizablePerfNode.java	2016-06-03 11:04:47.797423096 -0700
+++ new/modules/graphics/src/test/java/test/javafx/scene/bounds/ResizablePerfNode.java	2016-06-03 11:04:47.637423098 -0700
@@ -25,9 +25,12 @@
 
 package test.javafx.scene.bounds;
 
+import com.sun.javafx.scene.NodeHelper;
 import javafx.beans.property.FloatProperty;
 import javafx.geometry.BoundingBox;
 import javafx.geometry.Bounds;
+import javafx.scene.Node;
+import test.com.sun.javafx.scene.bounds.ResizablePerfNodeHelper;
 
 /**
  * A resizable version of PerfNode. Note that in this case, layoutBounds is
@@ -36,8 +39,31 @@
  * layout bounds to be created.
  */
 public class ResizablePerfNode extends PerfNode {
+    static {
+         // This is used by classes in different packages to get access to
+         // private and package private methods.
+        ResizablePerfNodeHelper.setResizablePerfNodeAccessor(
+                new ResizablePerfNodeHelper.ResizablePerfNodeAccessor() {
+            @Override
+            public Bounds doComputeLayoutBounds(Node node) {
+                return ((ResizablePerfNode) node).doComputeLayoutBounds();
+            }
+
+            @Override
+            public void doNotifyLayoutBoundsChanged(Node node) {
+                ((ResizablePerfNode) node).doNotifyLayoutBoundsChanged();
+            }
+        });
+    }
+
+    {
+        // To initialize the class helper at the begining each constructor of this class
+        ResizablePerfNodeHelper.initHelper(this);
+    }
+    ResizablePerfNode() {
+    }
 
-    @Override protected Bounds impl_computeLayoutBounds() {
+    private Bounds doComputeLayoutBounds() {
         return new BoundingBox(0, 0, getWidth(), getHeight());
     }
 
@@ -53,19 +79,18 @@
         return getHeight();
     }
 
-    @Override
-    public void impl_notifyLayoutBoundsChanged() { }
+    private void doNotifyLayoutBoundsChanged() { }
 
     @Override
     protected void impl_storeWidth(FloatProperty model, float value) {
         super.impl_storeWidth(model, value);
-        super.impl_notifyLayoutBoundsChanged();
+        ResizablePerfNodeHelper.superNotifyLayoutBoundsChanged(this);
     }
 
     @Override
     protected void impl_storeHeight(FloatProperty model, float value) {
         super.impl_storeHeight(model, value);
-        super.impl_notifyLayoutBoundsChanged();
+        ResizablePerfNodeHelper.superNotifyLayoutBoundsChanged(this);
     }
 
     @Override public double minWidth(double height) {