diff options
| author | serb <none@none> | 2015-03-12 10:06:55 -0700 |
|---|---|---|
| committer | serb <none@none> | 2015-03-12 10:06:55 -0700 |
| commit | 8faa23dec584d8c05899a563f3971e8c7f21d06e (patch) | |
| tree | 02a6695a71bf1a97f82026231f514ce97a49e55f | |
| parent | 8fee60318f22839e62d6e8d4ddc9f07112fe8948 (diff) | |
8074668: [macosx] Mac 10.10: Application run with splash screen has focus issuesjdk8u40-b27
Reviewed-by: prr, ant, alexsch
| -rw-r--r-- | src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m | 6 | ||||
| -rw-r--r-- | test/java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m b/src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m index 0eaf688ca..c71c6361f 100644 --- a/src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m +++ b/src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m @@ -131,11 +131,7 @@ char* SplashGetScaledImageName(const char* jar, const char* file, 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]; diff --git a/test/java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java b/test/java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java index a13cd8152..92de5f516 100644 --- a/test/java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java +++ b/test/java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java @@ -36,7 +36,7 @@ import javax.imageio.ImageIO; import sun.java2d.SunGraphics2D; /** - * @test + * test * @bug 8043869 * @author Alexander Scherbatiy * @summary [macosx] java -splash does not honor 2x hi dpi notation for retina |