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

8251558: J2DBench should support shaped and translucent windows #613

Closed
wants to merge 1 commit into from

Conversation

@gnu-andrew
Copy link
Member

@gnu-andrew gnu-andrew commented Nov 10, 2021

I discovered this change when looking at potential conflicts for JDK-8275872. Shaped and translucent windows have been supported since OpenJDK 6, so having support for these in 11u's J2DBench seems appropriate and a good way of testing these features.

I've dropped the Makefile, README & build.xml changes which bump the source & target to 1.7 as the 11u javac compiler can still compile for 1.6. Other than that, the patch applies as is, bar some copyright conflicts, thanks to JDK-8211693 : "Convert C-style array declarations in client demos and jdk.accessibility" and JDK-8223237: "Replace use of string.equals("") with isEmpty() in java.desktop". The absence of the latter also means we don't need to revert it in OutputImageTests.java & InputImageTests.java


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8251558: J2DBench should support shaped and translucent windows

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/613/head:pull/613
$ git checkout pull/613

Update a local copy of the PR:
$ git checkout pull/613
$ git pull https://git.openjdk.java.net/jdk11u-dev pull/613/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 613

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/613.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Nov 10, 2021

👋 Welcome back andrew! 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 openjdk bot changed the title Backport 484864c932c34bc7e338b100411f9245f35fc4a4 8251558: J2DBench should support shaped and translucent windows Nov 10, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Nov 10, 2021

This backport pull request has now been updated with issue from the original commit.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Nov 10, 2021

Webrevs

Copy link
Contributor

@shipilev shipilev left a comment

Looks good.

(We could have left the bump to 1.7 as is, but this is also fine)

@openjdk
Copy link

@openjdk openjdk bot commented Nov 16, 2021

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

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

8251558: J2DBench should support shaped and translucent windows

Reviewed-by: shade

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 12 new commits pushed to the master branch:

  • 3593e1e: 8034084: nsk.nsk/jvmti/ThreadStart/threadstart003 Wrong number of thread end events
  • 9f7729a: 8258457: testlibrary_tests/ctw/JarDirTest.java fails with InvalidPathException on windows
  • 63848c5: 8201224: Make string buffer size dynamic in mlvmJvmtiUtils.c
  • 18f16db: 8174819: java/nio/file/WatchService/LotsOfEvents.java fails intermittently
  • 4b0cb20: 8204161: [TESTBUG] auto failed with the "Applet thread threw exception: java.lang.UnsupportedOperationException" exception
  • f8553d3: 8208242: Add @requires to vmTestbase/gc/g1 tests
  • 46d8523: 8261916: gtest/GTestWrapper.java vmErrorTest.unimplemented1_vm_assert failed
  • 6ec651f: 8276550: Use SHA256 hash in build.tools.depend.Depend
  • e608a20: 8236596: HttpClient leaves HTTP/2 sockets in CLOSE_WAIT, when using proxy tunnel
  • c6242ed: 8276854: Windows GHA builds fail due to broken Cygwin
  • ... and 2 more: https://git.openjdk.java.net/jdk11u-dev/compare/c406da13284934c11f04146daa9ebc960d0f5f4f...master

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 label Nov 16, 2021
@gnu-andrew
Copy link
Member Author

@gnu-andrew gnu-andrew commented Nov 24, 2021

Looks good.

(We could have left the bump to 1.7 as is, but this is also fine)

Thanks. I would like to follow up with a patch to trunk to allow the path to javac and the source/target options to be configured more easily. It's implied that the code should continue working on 1.4, but actually testing that means hacking the Makefile at present.

@gnu-andrew
Copy link
Member Author

@gnu-andrew gnu-andrew commented Dec 6, 2021

Now has jdk11u-fix-yes.

@gnu-andrew
Copy link
Member Author

@gnu-andrew gnu-andrew commented Dec 6, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Dec 6, 2021

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

  • db702ee: 8254940: AArch64: Cleanup non-product thread members
  • 126a16e: 8266173: -Wmaybe-uninitialized happens in jni_util.c
  • 9d07232: 8263185: Mallinfo deprecated in glibc 2.33
  • 78ab2fb: 8257467: [TESTBUG] -Wdeprecated-declarations is reported at sigset() in exesigtest.c
  • 12ffc99: 8266176: -Wmaybe-uninitialized happens in libArrayIndexOutOfBoundsExceptionTest.c
  • a0c349b: 8274265: Suspicious string concatenation in logTestUtils.inline.hpp
  • 35964ca: 8222825: ARM32 SIGILL issue on single core CPU (not supported PLDW instruction)
  • d2ed8cd: 8276105: C2: Conv(D|F)2(I|L)Nodes::Ideal should handle rounding correctly
  • 596816e: 8268882: C2: assert(n->outcnt() != 0 || C->top() == n || n->is_Proj()) failed: No dead instructions after post-alloc
  • 1f885a1: 8272345: macos doesn't check os::set_boot_path() result
  • ... and 64 more: https://git.openjdk.java.net/jdk11u-dev/compare/c406da13284934c11f04146daa9ebc960d0f5f4f...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Dec 6, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Dec 6, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Dec 6, 2021

@gnu-andrew Pushed as commit f8ed0fe.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants