8299977: Update WebKit to 615.1

[kevinrushforth]

Clean backport. Tested in connection with 4 other WebKit fixes in the test-kcr-11.0.19 branch, including a successful CI build. I also verfied that the native WebKit code is identical to mainline jfx after applying all patches (excluding a couple of copyright years).

---

Progress

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

Issue

• JDK-8299977: Update WebKit to 615.1

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 132

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jfx11u/pull/132.diff

[bridgekeeper]

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

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

[openjdk]

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

8299977: Update WebKit to 615.1

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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.

[mlbridge]

Webrevs

• 00: Full (65c73e5a)

[kevinrushforth]

As often happens with a very large patch like this one, Skara has not marked it clean even though it is. Here is the diff of the two patches:

$ diff 301bbd6409d463c4f789e2b3dcb6b2ea200d7373.patch 65c73e5ab15ef095a09b95b5a012fbe3636a1cfd.patch
1c1
< commit 301bbd6409d463c4f789e2b3dcb6b2ea200d7373
---
> commit 65c73e5ab15ef095a09b95b5a012fbe3636a1cfd
167546c167546
< index 23efcd5441..17752cafb9 100644
---
> index acd7c980f3..4d716d6ca7 100644
342135c342135
< index afbd76f473..d6559d19c1 100644
---
> index 4ad0097a28..1802773ccd 100644
342176c342176
< @@ -649,10 +649,10 @@ void GraphicsContextJava::strokeRect(const FloatRect& rect, float lineWidth)
---
> @@ -645,10 +645,10 @@ void GraphicsContextJava::strokeRect(const FloatRect& rect, float lineWidth)
342190c342190
< @@ -742,10 +742,10 @@ void GraphicsContextJava::strokePath(const Path& path)
---
> @@ -738,10 +738,10 @@ void GraphicsContextJava::strokePath(const Path& path)
342204c342204
< @@ -869,26 +869,26 @@ void GraphicsContextJava::fillPath(const Path& path)
---
> @@ -865,26 +865,26 @@ void GraphicsContextJava::fillPath(const Path& path)
342240c342240
< @@ -993,37 +993,37 @@ AffineTransform GraphicsContextJava::getCTM(IncludeDeviceScale) const
---
> @@ -989,37 +989,37 @@ AffineTransform GraphicsContextJava::getCTM(IncludeDeviceScale) const
342292c342292
< @@ -1036,6 +1036,8 @@ void GraphicsContextJava::fillRoundedRectImpl(const FloatRoundedRect& rect, cons
---
> @@ -1032,6 +1032,8 @@ void GraphicsContextJava::fillRoundedRectImpl(const FloatRoundedRect& rect, cons
342302c342302
< index a27102d804..6ce99ab62f 100644
---
> index 526ee45a1f..209790bcae 100644
447690c447690
< index 10832859f7..4dc5171f39 100644
---
> index 5cea56639d..d0a174e233 100644

There are no differences in the two patches, either in the diffs themselves or in the surrounding context. The line numbers are different because the mainline patch was done on top of the fix for JDK-8298167, which added (unconflicting) code to GraphicsContextJava.cpp, whereas the backport patch was not. This isn't what is causing Skara to fail to mark this as clean, though. Rather the failure of Skara to mark this as clean is another instance of SKARA-1332. I am manually marking it clean.

/clean

[openjdk]

@kevinrushforth This backport pull request is already marked as clean

[kevinrushforth]

It turns out I just wasn't patient enough and didn't refresh the PR before posting my comment. Skara marked it clean after all. :)

So you can ignore my previous comment (although it was a good double-check that the patch was in fact clean).

[kevinrushforth]

/integrate

[openjdk]

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

• fc8904a: 8298167: Opacity in WebView not working anymore
• 903bef5: 8295755: Update SQLite to 3.39.4
• ac4756c: 8293375: add_definitions USE_SYSTEM_MALLOC when USE_SYSTEM_MALLOC is ON

Your commit was automatically rebased without conflicts.

[openjdk]

@kevinrushforth Pushed as commit b0eed55.

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