changeset 1399:6b0866a7c08c

Automated merge with ssh://jfxsrc.us.oracle.com//javafx/2.2/MASTER/jfx/rt
author Yao Wang <yao.w.wang@oracle.com>
date Tue, 03 Jul 2012 10:09:32 -0700
parents dffc6988a9ab b27852b420e2
children bc2e7244d877 64f2c821ab4e
files
diffstat 4 files changed, 3 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/javafx-ui-common/src/javafx/scene/Scene.java	Mon Jul 02 13:05:18 2012 -0700
+++ b/javafx-ui-common/src/javafx/scene/Scene.java	Tue Jul 03 10:09:32 2012 -0700
@@ -1514,6 +1514,7 @@
      * @treatAsPrivate implementation detail
      * @deprecated This is an internal API that is not intended for use and will be removed in the next version
      */
+    // SB-dependency: RT-22747 has been filed to track this
     @Deprecated
     public void impl_processMouseEvent(MouseEvent e) {
         if (e.getEventType() == MouseEvent.MOUSE_CLICKED) {
--- a/javafx-ui-common/src/javafx/scene/canvas/Canvas.java	Mon Jul 02 13:05:18 2012 -0700
+++ b/javafx-ui-common/src/javafx/scene/canvas/Canvas.java	Tue Jul 03 10:09:32 2012 -0700
@@ -95,6 +95,7 @@
     }
 
     GrowableDataBuffer<Object> getBuffer() {
+        impl_markDirty(DirtyBits.NODE_CONTENTS);
         if (theBuffer == null) {
             theBuffer = new GrowableDataBuffer<Object>(DEFAULT_BUF_SIZE);
         }
@@ -111,12 +112,6 @@
         return theContext;
     }
 
-    void markBufferDirty() {
-        if (theBuffer == null || theBuffer.position() == 0) {
-            impl_markDirty(DirtyBits.NODE_CONTENTS);
-        }
-    }
-
     /**
      * Defines the width of the canvas.
      *
--- a/javafx-ui-common/src/javafx/scene/canvas/GraphicsContext.java	Mon Jul 02 13:05:18 2012 -0700
+++ b/javafx-ui-common/src/javafx/scene/canvas/GraphicsContext.java	Tue Jul 03 10:09:32 2012 -0700
@@ -211,7 +211,6 @@
     }
 
     private GrowableDataBuffer getBuffer() {
-        theCanvas.markBufferDirty();
         return theCanvas.getBuffer();
     }
 
--- a/javafx-ui-common/src/javafx/scene/input/KeyCode.java	Mon Jul 02 13:05:18 2012 -0700
+++ b/javafx-ui-common/src/javafx/scene/input/KeyCode.java	Tue Jul 03 10:09:32 2012 -0700
@@ -1297,6 +1297,7 @@
      * @treatAsPrivate implementation detail
      * @deprecated This is an internal API that is not intended for use and will be removed in the next version
      */
+    // SB-dependency: RT-22749 has been filed to track this
     @Deprecated
     public int impl_getCode() {
         return code;