Mercurial > hg > openjdk > aarch64-port > jdk
changeset 10974:d8ac13c5eafe jdk8u40-b32
Merge
author | asaha |
---|---|
date | Thu, 12 Mar 2015 22:18:02 -0700 |
parents | 64a89478cc81 (current diff) c7bbaa04eaa8 (diff) |
children | c7fbbf6133c3 |
files | .hgtags |
diffstat | 3 files changed, 3 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed Mar 11 13:47:42 2015 -0700 +++ b/.hgtags Thu Mar 12 22:18:02 2015 -0700 @@ -383,4 +383,5 @@ 9d903721276c8684706db7ecfb6cda568e9f4f69 jdk8u40-b24 f0d5cb59b0e6a67fa102465458cc4725c6e59089 jdk8u40-b25 97f258823d7d8ee0ec7d774b79cd30492520cc10 jdk8u40-b26 +d4453d784fb6c52e4ed998b167588551e2fd43c5 jdk8u40-b27 5a45234e0fc14ff943e13dc1f8966818acaeb4de jdk8u40-b31
--- a/src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m Wed Mar 11 13:47:42 2015 -0700 +++ b/src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m Thu Mar 12 22:18:02 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 Mar 11 13:47:42 2015 -0700 +++ b/test/java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java Thu Mar 12 22:18:02 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