8298887: On the latest macOS+XCode the Robot API may report wrong colors

Reviewed-by: azvegint
This commit is contained in:
Sergey Bylokhov 2022-12-22 07:20:06 +00:00
parent 34cdda5b83
commit 50120396b6
5 changed files with 5 additions and 17 deletions

View File

@ -47,10 +47,6 @@
#define k_JAVA_ROBOT_WHEEL_COUNT 1
#if !defined(kCGBitmapByteOrder32Host)
#define kCGBitmapByteOrder32Host 0
#endif
// In OS X, left and right mouse button share the same click count.
// That is, if one starts clicking the left button rapidly and then
// switches to the right button, then the click count will continue
@ -355,7 +351,7 @@ Java_sun_lwawt_macosx_CRobot_nativeGetScreenPixels
8, picWidth * sizeof(jint),
picColorSpace,
kCGBitmapByteOrder32Host |
kCGImageAlphaPremultipliedFirst);
kCGImageAlphaNoneSkipFirst);
CGColorSpaceRelease(picColorSpace);

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -29,14 +29,6 @@
#import <Cocoa/Cocoa.h>
#import "JNIUtilities.h"
// these flags are not defined on Tiger on PPC, so we need to make them a no-op
#if !defined(kCGBitmapByteOrder32Host)
#define kCGBitmapByteOrder32Host 0
#endif
#if !defined(kCGBitmapByteOrder16Host)
#define kCGBitmapByteOrder16Host 0
#endif
// NOTE : Modify the printSurfaceDataDiagnostics API if you change this enum
enum SDRenderType
{

View File

@ -25,7 +25,7 @@
/**
* @test
* @key headful
* @bug 8266079
* @bug 8266079 8298887
* @summary [macosx] window rendering alpha composite test
* @author Alexey Ushakov
* @run main WindowAlphaCompositeTest

View File

@ -40,7 +40,7 @@ import javax.imageio.ImageIO;
/**
* @test
* @key headful
* @bug 8215105 8211999
* @bug 8215105 8211999 8298887
* @summary tests that Robot can capture the common colors without artifacts
* @run main/othervm CheckCommonColors
* @run main/othervm -Xcheck:jni CheckCommonColors

View File

@ -23,7 +23,7 @@
/**
* @test
* @bug 8240756
* @bug 8240756 8298887
* @summary Non-English characters are printed with wrong glyphs on MacOS
* @modules java.desktop/sun.java2d java.desktop/sun.java2d.loops java.desktop/sun.font
* @requires os.family == "mac"