[jfx11u] RFR: 8285881: Update WebKit to 614.1
Kevin Rushforth
kcr at openjdk.org
Wed Aug 17 15:24:26 UTC 2022
On Wed, 17 Aug 2022 14:35:27 GMT, Ambarish Rapte <arapte at openjdk.org> wrote:
> This is almost a clean backport, except a small conflict in a test file `LoadTest.java`.
>
> The conflict was because [fix](https://github.com/openjdk/jfx/commit/15e52d8f) for [JDK-8253696](https://bugs.openjdk.org/browse/JDK-8253696) is not backported to jfx11u.
> A test `testLoadLocalCSS()` was added as part of fix for [JDK-8253696](https://bugs.openjdk.org/browse/JDK-8253696), which is not present in jfx11u.
>
> No other conflict were observed.
Odd that Skara marked this as clean given that there was a (trivial) merge conflict that had to be resolved. I plan to file a bug against Skara.
-------------
PR: https://git.openjdk.org/jfx11u/pull/109
More information about the openjfx-dev
mailing list