8311689: Wrong visible amount in Adjustable of ScrollPane

[aivanov-jdk]

It proved that ScrollPane.layout depends on the result of WScrollPanePeer.childResized, specifically on setSpans which recalculates the spans and sets the insets.

jdk/src/java.desktop/share/classes/java/awt/ScrollPane.java

Lines 514 to 521 in b285ed7

	if (peer != null) {
	peer.childResized(cs.width, cs.height);
	}
	// update adjustables... the viewport size may have changed
	// with the scrollbars coming or going so the viewport size
	// is updated before the adjustables.
	vs = getViewportSize();

After the fix for JDK-8297923, setSpans that is called in childResized is run asynchronously on the toolkit thread. Therefore getViewportSize uses the wrong insets which don't take into account the size of the scroll bar. Because of it, the visibleAmount field of adjustables is also wrong, and the scroll pane cannot display a portion of its child component.

I overlooked this dependency even when I was fixing the first regression, JDK-8310054. Had I followed Harshitha's advice in #14478, I would've fixed this problem too. Similarly, Phil's intuition was right: setSpans should be synchronous. @honkar-jdk @prrace

Fix

The fix is to run AwtScrollPane::_SetSpans synchronously using AwtToolkit::InvokeFunction.

I also addressed Sergey's concern: VerifyState is now called after SetInsets. @mrserb

Client tests are green.

---

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-8311689: Wrong visible amount in Adjustable of ScrollPane (Bug - P2)

Reviewers

• Phil Race (@prrace - Reviewer)
• Harshitha Onkar (@honkar-jdk - Committer)
• Sergey Bylokhov (@mrserb - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14815

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

Using diff file

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

Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back aivanov! 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]

@aivanov-jdk 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.

[mlbridge]

Webrevs

• 01: Full - Incremental (f40921ca)
• 00: Full (f9e59211)

[openjdk]

@aivanov-jdk 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:

8311689: Wrong visible amount in Adjustable of ScrollPane

Reviewed-by: prr, honkar, serb

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:

• 4b1403d: 8311548: AArch64: [ZGC] Many tests fail with "assert(allocates2(pc)) failed: not in CodeBuffer memory" on some CPUs
• 940a4e1: 8304503: Modernize debugging jvm args in demo netbeans projects
• 57e7e82: 8309637: runtime/handshake/HandshakeTimeoutTest.java fails with "has not cleared handshake op" and SIGILL
• 63f32fb: 8311528: Remove IDE specific SuppressWarnings
• b285ed7: 8311666: Disabled tests in test/jdk/sun/java2d/marlin
• 6569b25: 8311593: Minor doc issue in MemorySegment::copy
• 623cfcd: 8310892: ScopedValue throwing StructureViolationException should be clearer

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.

[honkar-jdk]

Tested locally by applying the patch. Fix looks good.

[aivanov-jdk]

/integrate

[openjdk]

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

• a1cfc96: 8311245: JFR: Remove t.printStackTrace() in PeriodicEvents
• 4b1403d: 8311548: AArch64: [ZGC] Many tests fail with "assert(allocates2(pc)) failed: not in CodeBuffer memory" on some CPUs
• 940a4e1: 8304503: Modernize debugging jvm args in demo netbeans projects
• 57e7e82: 8309637: runtime/handshake/HandshakeTimeoutTest.java fails with "has not cleared handshake op" and SIGILL
• 63f32fb: 8311528: Remove IDE specific SuppressWarnings
• b285ed7: 8311666: Disabled tests in test/jdk/sun/java2d/marlin
• 6569b25: 8311593: Minor doc issue in MemorySegment::copy
• 623cfcd: 8310892: ScopedValue throwing StructureViolationException should be clearer

Your commit was automatically rebased without conflicts.

[openjdk]

@aivanov-jdk Pushed as commit b3f3403.

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