2 files changed, 14 insertions, 3 deletions
diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/NullWindow.java b/src/nativewindow/classes/com/sun/nativewindow/impl/NullWindow.java
index c5a617990..6f568df13 100644
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/NullWindow.java
+++ b/src/nativewindow/classes/com/sun/nativewindow/impl/NullWindow.java
@@ -96,7 +96,17 @@ public class NullWindow implements NativeWindow {
     return false;
   }
 
-  public void surfaceUpdated(Object updater) { }
+  NativeWindow upstreamNW = null;
+
+  public void setUpstreamNativeWindow(NativeWindow upstream) {
+    upstreamNW = upstream;
+  }
+
+  public void surfaceUpdated(Object updater, NativeWindow window, long when) { 
+    if(null!=upstreamNW) {
+        upstreamNW.surfaceUpdated(updater, upstreamNW, when);
+    }
+  }
 
   public long getDisplayHandle() {
     return displayHandle;
@@ -142,7 +152,8 @@ public class NullWindow implements NativeWindow {
     return "NullWindow[config "+config+
                 ", displayHandle 0x"+Long.toHexString(getDisplayHandle())+
                 ", surfaceHandle 0x"+Long.toHexString(getSurfaceHandle())+
-                ", size "+getWidth()+"x"+getHeight()+"]";
+                ", size "+getWidth()+"x"+getHeight()+
+                ", upstream "+upstreamNW+"]";
   }
 
 }
diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTWindow.java b/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTWindow.java
index b4975706d..e821f9b3a 100644
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTWindow.java
+++ b/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTWindow.java
@@ -129,7 +129,7 @@ public abstract class JAWTWindow implements NativeWindow {
     return false;
   }
 
-  public void surfaceUpdated(Object updater) { }
+  public void surfaceUpdated(Object updater, NativeWindow window, long when) { }
 
   public long getDisplayHandle() {
     return config.getScreen().getDevice().getHandle();