diff options
author | asaha <none@none> | 2015-04-09 14:19:42 -0700 |
---|---|---|
committer | asaha <none@none> | 2015-04-09 14:19:42 -0700 |
commit | cb93fb7b789a61937bbce3cab460a9529e1407e8 (patch) | |
tree | 794babecbfe08e14bb1df3e4a51973aefeae2075 | |
parent | 24017660bea757d7d88f4f1431731910f96bd83f (diff) | |
parent | 24fa4b9d4d0afdbdc9fa055fe014808e695e0426 (diff) |
Mergejdk8u45-b12
-rw-r--r-- | .hgtags | 1 | ||||
-rw-r--r-- | src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m | 6 | ||||
-rw-r--r-- | test/java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java | 2 |
3 files changed, 3 insertions, 6 deletions
@@ -383,6 +383,7 @@ d168113f9841a77b3cee3a6a45fcd85b7351ac90 jdk8u40-b22 9d903721276c8684706db7ecfb6cda568e9f4f69 jdk8u40-b24 f0d5cb59b0e6a67fa102465458cc4725c6e59089 jdk8u40-b25 97f258823d7d8ee0ec7d774b79cd30492520cc10 jdk8u40-b26 +d4453d784fb6c52e4ed998b167588551e2fd43c5 jdk8u40-b27 1ecc234bd38950a2bc047aa253a5e803f0836a4e jdk8u45-b00 e0c7864bbca3f76cde680722f2ae58dff2bff61d jdk8u45-b01 9505c0392cddbfb905401e9fccc23262edc3254f jdk8u45-b02 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 |