RFR: 8349924: Additional WebKit 620.1 fixes from WebKitGTK 2.46.6

Kevin Rushforth kcr at openjdk.org
Sat Feb 22 14:17:59 UTC 2025


On Sat, 22 Feb 2025 02:31:58 GMT, Jay Bhaskar <jbhaskar at openjdk.org> wrote:

> WebkitGTK 2.46.6 has additional fixes for crash and rendering issue, the crash fix is related to Skia CPU rendering which does not apply to JavaFX Webkit. 
> This patch has been tested on Jenkins and there is no side effects introduced.

I left a couple (minor) questions, but the changes look good to me. I'll test it early next week.

modules/javafx.web/src/main/native/Source/JavaScriptCore/Configurations/Base.xcconfig line 1:

> 1: // Copyright (C) 2009-2023 Apple Inc. All rights reserved.

We don't currently have the `Source/JavaScriptCore/Configurations` directory or any of the `.xcconfig` files in our repo. I think you can revert these file additions.

modules/javafx.web/src/main/native/Source/WTF/wtf/FileSystem.cpp line 534:

> 532: }
> 533: 
> 534: #if !PLATFORM(JAVA)

Can you explain this change? The only way I can see that it would make sense is if all of the following are true:

1. In WebKit620.1 _prior to_ the 2.46.6 changes, neither  `HAVE(STD_FILESYSTEM)` nor `HAVE(STD_EXPERIMENTAL_FILESYSTEM)` were defined in the CMake files.
2. The upstream code removed the conditional checks
3. We still need to exclude it from our port

Are all three of the above statements true?

-------------

PR Review: https://git.openjdk.org/jfx/pull/1722#pullrequestreview-2634808113
PR Review Comment: https://git.openjdk.org/jfx/pull/1722#discussion_r1966518897
PR Review Comment: https://git.openjdk.org/jfx/pull/1722#discussion_r1966520982


More information about the openjfx-dev mailing list