JDK-8324337: Cherry-pick WebKit 617.1 stabilization fixes

[HimaBinduMeda]

Cherry-picked changes related to webkit-2.42.4.Verified build on all platforms. Sanity testing looks fine.

---

Progress

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

Issue

• JDK-8324337: Cherry-pick WebKit 617.1 stabilization fixes (Bug - P3)

Reviewers

• Kevin Rushforth (@kevinrushforth - Reviewer)
• Joeri Sykora (@tiainen - Author)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1350

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jfx/pull/1350.diff

Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back hmeda! 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.

[mlbridge]

Webrevs

• 02: Full - Incremental (229deb24)
• 01: Full - Incremental (7417b819)
• 00: Full (a5148855)

[kevinrushforth]

/reviewers 2

[openjdk]

@kevinrushforth
The total number of required reviews for this PR (including the jcheck configuration and the last /reviewers command) is now set to 2 (with at least 1 Reviewer, 1 Author).

[kevinrushforth]

Code changes look fine with one suggestion in the added code under #if PLATFOMR(JAVA).

I'll test it and finish my review.

[kevinrushforth]

The added curly braces should be within #if PLATFORM(JAVA).

Minor: the indentation is off in a couple places.

Minor: add a missing space after the if on line 191.

Here is a suggestion:

#if PLATFORM(JAVA)
        if (spannerAndPlaceholder.value.get() != nullptr)
        {
#endif
            if (!placeholder.isDescendantOf(&container))
                continue;
            placeholdersToRestore.append(&placeholder);
#if PLATFORM(JAVA)
        }
#endif

[HimaBinduMeda]

done

[kevinrushforth]

Looks good now.

Minor: the indentation is still a bit off, but I'll approve as-is. If you decide to fix it, I'll reapprove.

[kevinrushforth]

@tiainen or @johanvos can one of you be the second reviewer?

[tiainen]

Everything built fine.

[openjdk]

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

8324337: Cherry-pick WebKit 617.1 stabilization fixes

Reviewed-by: kcr, sykora

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

• d653a31: 8260013: Snapshot does not work for nodes in a subscene
• 876d535: 8324239: JFXPanelHiDPITest fails on Windows 11
• 767b027: 8324797: Code example in JavaDoc of ObservableValue#when doesn't compile
• 359ffb9: 8308955: MediaPlayer/AudioClip skip data on seek/loop

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.

[kevinrushforth]

@tiainen Can you rereview? (only whitespace changed from last time)

[HimaBinduMeda]

/integrate

[openjdk]

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

• d653a31: 8260013: Snapshot does not work for nodes in a subscene
• 876d535: 8324239: JFXPanelHiDPITest fails on Windows 11
• 767b027: 8324797: Code example in JavaDoc of ObservableValue#when doesn't compile
• 359ffb9: 8308955: MediaPlayer/AudioClip skip data on seek/loop

Your commit was automatically rebased without conflicts.

[openjdk]

@HimaBinduMeda Pushed as commit 52840a1.

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