8272481: [macos] javax/swing/JFrame/NSTexturedJFrame/NSTexturedJFrame.java fails

Alexey Ushakov · Alexey Ushakov · commit c4205305496f · 2021-08-26T12:56:03.000Z
Reviewed-by: serb, jdv
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformView.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformView.java
@@ -62,6 +62,7 @@ public void initialize(LWWindowPeer peer, CPlatformResponder responder) {
         initializeBase(peer, responder);
 
         this.windowLayer = CGraphicsDevice.usingMetalPipeline()? createMTLLayer() : createCGLayer();
+
         setPtr(nativeCreateView(0, 0, 0, 0, getWindowLayerPtr()));
     }
 
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
@@ -363,7 +363,9 @@ public void initialize(Window _target, LWWindowPeer _peer, PlatformWindow _owner
             }
         });
         setPtr(ref.get());
-
+        if (peer != null) { // Not applicable to CWarningWindow
+            peer.setTextured(IS(TEXTURED, styleBits));
+        }
         if (target instanceof javax.swing.RootPaneContainer) {
             final javax.swing.JRootPane rootpane = ((javax.swing.RootPaneContainer)target).getRootPane();
             if (rootpane != null) rootpane.addPropertyChangeListener("ancestor", new PropertyChangeListener() {
@@ -530,8 +532,6 @@ protected int getInitialStyleBits() {
             }
         }
 
-        peer.setTextured(IS(TEXTURED, styleBits));
-
         return styleBits;
     }
 
diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
@@ -726,7 +726,6 @@ javax/swing/JTree/4633594/JTreeFocusTest.java 8173125 macosx-all
 javax/swing/AbstractButton/6711682/bug6711682.java 8060765 windows-all,macosx-all
 javax/swing/JFileChooser/4524490/bug4524490.java 8042380 generic-all
 javax/swing/JFileChooser/6396844/TwentyThousandTest.java 8198003 generic-all
-javax/swing/JFrame/NSTexturedJFrame/NSTexturedJFrame.java 8272481 macosx-all
 javax/swing/JPopupMenu/6580930/bug6580930.java 7124313 macosx-all
 javax/swing/JPopupMenu/6800513/bug6800513.java 7184956 macosx-all
 javax/swing/JTabbedPane/8007563/Test8007563.java 8051591 generic-all

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@ public void initialize(LWWindowPeer peer, CPlatformResponder responder) {`
`62`	`62`	`initializeBase(peer, responder);`
`63`	`63`
`64`	`64`	`this.windowLayer = CGraphicsDevice.usingMetalPipeline()? createMTLLayer() : createCGLayer();`
	`65`	`+`
`65`	`66`	`setPtr(nativeCreateView(0, 0, 0, 0, getWindowLayerPtr()));`
`66`	`67`	`}`
`67`	`68`
Original file line number	Diff line number	Diff line change
`@@ -363,7 +363,9 @@ public void initialize(Window _target, LWWindowPeer _peer, PlatformWindow _owner`
`363`	`363`	`}`
`364`	`364`	`});`
`365`	`365`	`setPtr(ref.get());`
`366`		`-`
	`366`	`+ if (peer != null) { // Not applicable to CWarningWindow`
	`367`	`+ peer.setTextured(IS(TEXTURED, styleBits));`
	`368`	`+ }`
`367`	`369`	`if (target instanceof javax.swing.RootPaneContainer) {`
`368`	`370`	`final javax.swing.JRootPane rootpane = ((javax.swing.RootPaneContainer)target).getRootPane();`
`369`	`371`	`if (rootpane != null) rootpane.addPropertyChangeListener("ancestor", new PropertyChangeListener() {`
`@@ -530,8 +532,6 @@ protected int getInitialStyleBits() {`
`530`	`532`	`}`
`531`	`533`	`}`
`532`	`534`
`533`		`- peer.setTextured(IS(TEXTURED, styleBits));`
`534`		`-`
`535`	`535`	`return styleBits;`
`536`	`536`	`}`
`537`	`537`