changeset 10664:6a8f9512afa6 jdk8u45-b12

Merge
author asaha
date Thu, 09 Apr 2015 14:19:42 -0700
parents 9692664b2bc9 c7bbaa04eaa8
children d464f2263fb4
files .hgtags
diffstat 3 files changed, 3 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Apr 09 14:15:19 2015 -0700
+++ b/.hgtags	Thu Apr 09 14:19:42 2015 -0700
@@ -383,6 +383,7 @@
 9d903721276c8684706db7ecfb6cda568e9f4f69 jdk8u40-b24
 f0d5cb59b0e6a67fa102465458cc4725c6e59089 jdk8u40-b25
 97f258823d7d8ee0ec7d774b79cd30492520cc10 jdk8u40-b26
+d4453d784fb6c52e4ed998b167588551e2fd43c5 jdk8u40-b27
 1ecc234bd38950a2bc047aa253a5e803f0836a4e jdk8u45-b00
 e0c7864bbca3f76cde680722f2ae58dff2bff61d jdk8u45-b01
 9505c0392cddbfb905401e9fccc23262edc3254f jdk8u45-b02
--- a/src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m	Thu Apr 09 14:15:19 2015 -0700
+++ b/src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m	Thu Apr 09 14:19:42 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	Thu Apr 09 14:15:19 2015 -0700
+++ b/test/java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java	Thu Apr 09 14:19:42 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