JBR-9727 Wayland: assertion error in ShadowImpl.updateSurfaceData

Author: mkartashev

src/java.desktop/unix/classes/sun/awt/wl/WLComponentPeer.java

@@ -448,10 +448,12 @@ private boolean targetIsModal() {
     }
 
     void updateSurfaceData() {
-        SurfaceData.convertTo(WLSurfaceDataExt.class, surfaceData).revalidate(
-                getGraphicsConfiguration(), getBufferWidth(), getBufferHeight(), getDisplayScale());
+        performLocked(() -> {
+            SurfaceData.convertTo(WLSurfaceDataExt.class, surfaceData).revalidate(
+                    getGraphicsConfiguration(), getBufferWidth(), getBufferHeight(), getDisplayScale());
 
-        shadow.updateSurfaceData();
+            shadow.updateSurfaceData();
+        });
     }
 
     public boolean isResizable() {
@@ -1065,10 +1067,11 @@ public boolean updateGraphicsData(GraphicsConfiguration gc) {
                     log.fine(String.format("%s is updating buffer to %dx%d pixels", this, getBufferWidth(), getBufferHeight()));
                 }
             }
-            updateSurfaceData();
-            postPaintEvent();
         }
 
+        updateSurfaceData();
+        postPaintEvent();
+
         // Not sure what would need to have changed in Wayland's graphics configuration
         // to warrant destroying the peer and creating a new one from scratch.
         // So return "never recreate" here.