RFR: JDK-8324337: Cherry-pick WebKit 617.1 stabilization fixes

Kevin Rushforth kcr at openjdk.org
Thu Jan 25 16:28:38 UTC 2024


On Thu, 25 Jan 2024 13:32:21 GMT, Hima Bindu Meda <hmeda at openjdk.org> wrote:

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

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

I'll test it and finish my review.

modules/javafx.web/src/main/native/Source/WebCore/rendering/updating/RenderTreeBuilderMultiColumn.cpp line 197:

> 195:             continue;
> 196:             placeholdersToRestore.append(&placeholder);
> 197:         }

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

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

PR Review: https://git.openjdk.org/jfx/pull/1350#pullrequestreview-1844057055
PR Review Comment: https://git.openjdk.org/jfx/pull/1350#discussion_r1466568516


More information about the openjfx-dev mailing list