# HG changeset patch
# Parent b5b2b061ac97385fc7738adffe7ba3545fdf3ceb
RT-35249 Add support for drawing surface change.

diff -r b5b2b061ac97 modules/graphics/src/main/java/com/sun/javafx/tk/quantum/PresentingPainter.java
--- a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/PresentingPainter.java	Fri Jan 10 09:29:40 2014 +0100
+++ b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/PresentingPainter.java	Fri Jan 10 09:31:12 2014 +0100
@@ -37,6 +37,8 @@
  */
 final class PresentingPainter extends ViewPainter {
 
+    static boolean afterScreenLost = false;
+    
     PresentingPainter(ViewScene view) {
         super(view);
     }
@@ -51,9 +53,13 @@
         try {
             valid = validateStageGraphics();
             if (!valid) {
-                if (QuantumToolkit.verbose) {
+                if (sceneState.getNativeScreen() == 0) {
+                    if (!afterScreenLost) {
+                        afterScreenLost = true;
+                    }                    
+                } else if (QuantumToolkit.verbose) {
                     System.err.println("PresentingPainter: validateStageGraphics failed");
-                }
+                }    
                 return;
             }
             
@@ -72,13 +78,15 @@
                 return;
             }
 
-            if (presentable != null && presentable.lockResources(sceneState)) {
+            if (presentable != null && presentable.lockResources(sceneState) ||
+                presentable != null && afterScreenLost) {
                 disposePresentable();
             }
-            if (presentable == null) {
+            if (presentable == null || afterScreenLost) {
                 presentable = factory.createPresentable(sceneState);
                 penWidth  = viewWidth;
                 penHeight = viewHeight;
+                if (afterScreenLost) afterScreenLost = false;
             }
             
             if (presentable != null) {
diff -r b5b2b061ac97 modules/graphics/src/main/java/com/sun/javafx/tk/quantum/SceneState.java
--- a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/SceneState.java	Fri Jan 10 09:29:40 2014 +0100
+++ b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/SceneState.java	Fri Jan 10 09:31:12 2014 +0100
@@ -85,7 +85,9 @@
      * render lock.
      */
     public boolean isValid() {
-        return getWindow() != null && getView() != null && !isViewClosed() && getWidth() > 0 && getHeight() > 0;
+        return getWindow() != null && getView() != null && !isViewClosed() && 
+                getWidth() > 0 && getHeight() > 0 &&
+                getNativeScreen() != 0; //lost display surface
     }
 
     /** Updates the state of this object based on the current
diff -r b5b2b061ac97 modules/graphics/src/main/java/com/sun/prism/PresentableState.java
--- a/modules/graphics/src/main/java/com/sun/prism/PresentableState.java	Fri Jan 10 09:29:40 2014 +0100
+++ b/modules/graphics/src/main/java/com/sun/prism/PresentableState.java	Fri Jan 10 09:31:12 2014 +0100
@@ -56,6 +56,7 @@
     protected boolean isWindowVisible;
     protected boolean isWindowMinimized;
     protected float screenScale;
+    protected long screenNativeHandle;
     protected static boolean hasWindowManager =
             Application.GetApplication().hasWindowManager();
     // Between PaintCollector and *Painter, there is a window where
@@ -164,6 +165,10 @@
     public int getScreenWidth() {
         return screenWidth;
     }
+    
+    public long getNativeScreen() {
+        return screenNativeHandle;
+    }
 
     /**
      * @return true if the underlying View is closed, false otherwise
@@ -221,7 +226,7 @@
     public View getView() {
         return view;
     }
-
+    
     /**
      * @return native pixel format
      *
@@ -290,10 +295,11 @@
             if (screen != null) {
                 // note only used by Embedded Z order painting 
                 // !hasWindowManager so should be safe to ignore
-                // when null, most likely because of "In Browswer"
+                // when null, most likely because of "In Browswer"                
                 screenHeight = screen.getHeight();
                 screenWidth = screen.getWidth();
                 screenScale = screen.getScale();
+                screenNativeHandle = screen.getNativeScreen();
             } else {
                 screenScale = 1.f;
             }
diff -r b5b2b061ac97 modules/graphics/src/main/native-glass/lens/wm/LensWindowManager.c
--- a/modules/graphics/src/main/native-glass/lens/wm/LensWindowManager.c	Fri Jan 10 09:29:40 2014 +0100
+++ b/modules/graphics/src/main/native-glass/lens/wm/LensWindowManager.c	Fri Jan 10 09:31:12 2014 +0100
@@ -1549,6 +1549,24 @@
     GLASS_LOG_FINE("DnD has ended");
 }
 
+void lens_wm_repaint_all(JNIEnv *env) {
+    render_lock();
+    glass_window_list_lock();
+    NativeWindow w = glass_window_list_getHead();
+    while (w) {
+        if (w && w->view) {            
+            glass_application_notifyViewEvent(env,
+                                              w->view,
+                                              com_sun_glass_events_ViewEvent_REPAINT,
+                                              w->currentBounds.x, w->currentBounds.y,
+                                              w->currentBounds.width, w->currentBounds.height);            
+        }
+        w = w->nextWindow;
+    }
+    glass_window_list_unlock();   
+    render_unlock();
+}
+
 //// RFB support
 static void lens_wm_initRFB(JNIEnv *env) {
 #ifdef USE_RFB
diff -r b5b2b061ac97 modules/graphics/src/main/native-glass/lens/wm/LensWindowManager.h
--- a/modules/graphics/src/main/native-glass/lens/wm/LensWindowManager.h	Fri Jan 10 09:29:40 2014 +0100
+++ b/modules/graphics/src/main/native-glass/lens/wm/LensWindowManager.h	Fri Jan 10 09:31:12 2014 +0100
@@ -239,5 +239,11 @@
  */
 void notify_lens_wm_DnDEnded();
 
+/**
+ * Repaint all windows
+ *
+ * @param env env
+ */
+void lens_wm_repaint_all(JNIEnv *env);
 #endif