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

8297923: java.awt.ScrollPane broken after multiple scroll up/down #1578

Closed
wants to merge 4 commits into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Jul 13, 2023

This backports 8297923 and its two follow ups.
All three apply clean, except of a Copyright fix in WScrollPanePeer.java in 8310054.


Progress

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

Issues

  • JDK-8297923: java.awt.ScrollPane broken after multiple scroll up/down (Bug - P3)
  • JDK-8310054: ScrollPane insets are incorrect (Bug - P3)
  • JDK-8311689: Wrong visible amount in Adjustable of ScrollPane (Bug - P2)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev.git pull/1578/head:pull/1578
$ git checkout pull/1578

Update a local copy of the PR:
$ git checkout pull/1578
$ git pull https://git.openjdk.org/jdk17u-dev.git pull/1578/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1578

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/1578.diff

Webrev

Link to Webrev Comment

@GoeLin
Copy link
Member Author

GoeLin commented Jul 13, 2023

/isssue add 8310054, 8311689

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 13, 2023

👋 Welcome back goetz! 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 ea41907396a70933c4f6e6b0f247f7ba589a3a23 8297923: java.awt.ScrollPane broken after multiple scroll up/down Jul 13, 2023
@openjdk
Copy link

openjdk bot commented Jul 13, 2023

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Jul 13, 2023
@openjdk
Copy link

openjdk bot commented Jul 13, 2023

@GoeLin Unknown command isssue - for a list of valid commands use /help.

@mlbridge
Copy link

mlbridge bot commented Jul 13, 2023

Webrevs

@GoeLin
Copy link
Member Author

GoeLin commented Jul 13, 2023

/issue add 8310054, 8311689

@openjdk
Copy link

openjdk bot commented Jul 13, 2023

@GoeLin
Adding additional issue to issue list: 8310054: ScrollPane insets are incorrect.

Adding additional issue to issue list: 8311689: Wrong visible amount in Adjustable of ScrollPane.

@GoeLin
Copy link
Member Author

GoeLin commented Jul 14, 2023

/clean

Marking as clean as it consists of three clean patches, disregarding the copyright resolve.
It also patches clean to 11.

@openjdk openjdk bot added the clean label Jul 14, 2023
@openjdk
Copy link

openjdk bot commented Jul 14, 2023

@GoeLin This backport pull request is now marked as clean

@openjdk
Copy link

openjdk bot commented Jul 14, 2023

@GoeLin 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:

8297923: java.awt.ScrollPane broken after multiple scroll up/down
8310054: ScrollPane insets are incorrect
8311689: Wrong visible amount in Adjustable of ScrollPane

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

  • 5536520: 8283326: Implement SafeFetch statically
  • 148af11: 8306060: Open source few AWT Insets related tests
  • 97cf4fe: 8309266: C2: assert(final_con == (jlong)final_int) failed: final value should be integer
  • a6ef655: 8309119: [17u/11u] Redo JDK-8297951: C2: Create skeleton predicates for all If nodes in loop predication
  • 3cc7858: 8307683: Loop Predication should not hoist range checks with trap on success projection by negating their condition
  • 9f3c095: 8307555: Reduce memory reads in x86 MD5 intrinsic
  • 2b8c260: 8310259: Pin msys2/setup-msys2 github action to a specific commit

Please see this link for an up-to-date comparison between the source branch of this pull request and 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 Jul 14, 2023
@GoeLin
Copy link
Member Author

GoeLin commented Jul 18, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Jul 18, 2023

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

  • d79c2ef: 8311862: RISC-V: small improvements to shift immediate instructions
  • 6d4bfb7: 8307147: [x86] Dangling pointer warning for Assembler::_attributes
  • a19596d: 8289512: Fix GCC 12 warnings for adlc output_c.cpp
  • 8c1a5bc: 8288719: [arm32] SafeFetch32 thumb interleaving causes random crashes
  • 5536520: 8283326: Implement SafeFetch statically
  • 148af11: 8306060: Open source few AWT Insets related tests
  • 97cf4fe: 8309266: C2: assert(final_con == (jlong)final_int) failed: final value should be integer
  • a6ef655: 8309119: [17u/11u] Redo JDK-8297951: C2: Create skeleton predicates for all If nodes in loop predication
  • 3cc7858: 8307683: Loop Predication should not hoist range checks with trap on success projection by negating their condition
  • 9f3c095: 8307555: Reduce memory reads in x86 MD5 intrinsic
  • ... and 1 more: https://git.openjdk.org/jdk17u-dev/compare/3006096ec45ccf92bd7aa281f58388b27397ec2d...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jul 18, 2023

@GoeLin Pushed as commit f18ecea.

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

@GoeLin GoeLin deleted the goetz_backport_8297923 branch July 18, 2023 09:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
1 participant