On Tue, 20 Jan 2026 18:13:55 GMT, Kevin Rushforth <[email protected]> wrote:
> @HimaBinduMeda There is a minor merge issue that will need to be fixed up
> following the recent integration of the changes from PR #2047 .
>
> To address this, do the following:
>
> 1. Merge in the latest jfx master.
>
> 2. Apply the following patch:
>
>
> ```
> ---
> a/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/ComplexTextController.cpp
> +++
> b/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/ComplexTextController.cpp
> @@ -499,7 +499,7 @@ void
> ComplexTextController::ComplexTextRun::setIsNonMonotonic()
> #else
> for (unsigned i = 0; i < m_glyphCount; ++i) {
> // Skip zero-width glyphs if needed
> - if (m_font.isZeroWidthSpaceGlyph(m_glyphs[i]))
> + if (m_font->isZeroWidthSpaceGlyph(m_glyphs[i]))
> continue;
> // Handle out of bound case
> unsigned charIndex = indexAt(i);
> ```
>
> I've already tested it both locally, and in our CI, so I'll just run a sanity
> test once you update the PR.
I have merged the latest jfx master and applied the patch to resolve build
failure. Verified locally on mac and in our CI build.
-------------
PR Comment: https://git.openjdk.org/jfx/pull/2042#issuecomment-3777067238