changeset 10547:a810f93ace76

8074668: [macosx] Mac 10.10: Application run with splash screen has focus issues Reviewed-by: prr, ant, alexsch
author serb
date Thu, 12 Mar 2015 10:06:55 -0700
parents aa2770d3ff19
children f31bbaa095ff ca2d2d87db0b
files src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m test/java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java
diffstat 2 files changed, 2 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m	Wed Feb 18 17:50:41 2015 +0100
+++ b/src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m	Thu Mar 12 10:06:55 2015 -0700
@@ -131,11 +131,7 @@
     NSAutoreleasePool *pool = [NSAutoreleasePool new];
     *scaleFactor = 1;
     char* scaledFile = nil;
-    __block float screenScaleFactor = 1;
-
-    [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
-        screenScaleFactor = [SplashNSScreen() backingScaleFactor];
-    }];
+    float screenScaleFactor = 1;
 
     if (screenScaleFactor > 1) {
         NSString *fileName = [NSString stringWithUTF8String: file];
--- a/test/java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java	Wed Feb 18 17:50:41 2015 +0100
+++ b/test/java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java	Thu Mar 12 10:06:55 2015 -0700
@@ -36,7 +36,7 @@
 import sun.java2d.SunGraphics2D;
 
 /**
- * @test
+ * test
  * @bug 8043869
  * @author Alexander Scherbatiy
  * @summary [macosx] java -splash does not honor 2x hi dpi notation for retina