Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Closed
wants to merge 3 commits into from

Conversation

mrserb
Copy link
Member

@mrserb mrserb commented Dec 19, 2022

The new macOS SDK provided by XCode 14.2 changed this macro:
# define kCGBitmapByteOrder32Host kCGBitmapByteOrder32Little
to this constant
static const CGBitmapInfo kCGBitmapByteOrder32Host = kCGBitmapByteOrder32Little;

As a result, our native code started to redefine the macro value to "define kCGBitmapByteOrder32Host 0". I think that was added a long time ago for a PPC platform.

I have also changed the type of the color we pass to the java Robot, the java code expects the xrgb format(the alpha ignored), but we for some reason prepared pre-multiplied alpha.

Tested on macOS 12.6.1 and 13.0.1 using xcode 14.2 and xcode 12.5.1


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

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

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/11733/head:pull/11733
$ git checkout pull/11733

Update a local copy of the PR:
$ git checkout pull/11733
$ git pull https://git.openjdk.org/jdk pull/11733/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 11733

View PR using the GUI difftool:
$ git pr show -t 11733

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/11733.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 19, 2022

👋 Welcome back serb! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Dec 19, 2022

@mrserb The following label will be automatically applied to this pull request:

  • client

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the client client-libs-dev@openjdk.org label Dec 19, 2022
@mrserb mrserb marked this pull request as ready for review December 20, 2022 05:53
@openjdk openjdk bot added the rfr Pull request is ready for review label Dec 20, 2022
@mlbridge
Copy link

mlbridge bot commented Dec 20, 2022

Webrevs

Copy link
Member

@azvegint azvegint left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.
Testing on macosx-aarch64 and macosx-x64 also looks good.

@openjdk
Copy link

openjdk bot commented Dec 21, 2022

@mrserb This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

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

Reviewed-by: azvegint

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 37 new commits pushed to the master branch:

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Dec 21, 2022
@mrserb
Copy link
Member Author

mrserb commented Dec 22, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Dec 22, 2022

Going to push as commit 5012039.
Since your change was applied there have been 49 commits pushed to the master branch:

  • 34cdda5: Merge
  • 22007a1: 8298893: Rename option UsePolyIntrinsics to UsePoly1305Intrinsics
  • 9adc349: 8298726: (fs) Change PollingWatchService to record last modified time as FileTime rather than milliseconds
  • 81933b7: 8298642: ParallelGC -XX:+UseNUMA eden spaces allocated on wrong node
  • 92fe304: 8298588: WebSockets: HandshakeUrlEncodingTest unnecessarily depends on a response body
  • f7be5b5: 8299156: Broken link in jdk.compiler/module-info.java
  • 3d4d9fd: 8298947: compiler/codecache/MHIntrinsicAllocFailureTest.java fails intermittently
  • e85d00f: 8299147: Minor accessibility errors in the specs and man index pages
  • f80face: 8202931: [macos] java/awt/Choice/ChoicePopupLocation/ChoicePopupLocation.java fails
  • 7e59a0e: 8298971: Move Console implementation into jdk internal package
  • ... and 39 more: https://git.openjdk.org/jdk/compare/5d330f5285b535b37dde5cd4e42374d92fafb550...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Dec 22, 2022
@openjdk openjdk bot closed this Dec 22, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 22, 2022
@openjdk
Copy link

openjdk bot commented Dec 22, 2022

@mrserb Pushed as commit 5012039.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@mrserb mrserb deleted the JDK-8298887 branch December 22, 2022 07:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
client client-libs-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants