Merge

.hgtags

@@ -383,4 +383,5 @@ d168113f9841a77b3cee3a6a45fcd85b7351ac90 jdk8u40-b22
 9d903721276c8684706db7ecfb6cda568e9f4f69 jdk8u40-b24
 f0d5cb59b0e6a67fa102465458cc4725c6e59089 jdk8u40-b25
 97f258823d7d8ee0ec7d774b79cd30492520cc10 jdk8u40-b26
+d4453d784fb6c52e4ed998b167588551e2fd43c5 jdk8u40-b27
 5a45234e0fc14ff943e13dc1f8966818acaeb4de jdk8u40-b31

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];

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