Bug 231341 – [LFC][IFC] InlineDisplay::Box should be able to tell if it's the first or the last box within the associated Layout::Box

• Status: RESOLVED
• Resolution: FIXED
• Component: Layout and Rendering

[zalan]

this is to help speed up box iterators

[zalan]

Created attachment 440457 [details]
Patch

[Antti Koivisto]

Comment on attachment 440457 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=440457&action=review

> Source/WebCore/layout/formattingContexts/inline/InlineDisplayContentBuilder.cpp:47
> +    if (inlineBox.isFirstBox() && inlineBox.isLastBox())
> +        return { InlineDisplay::Box::PositionWithinInlineLevelBox::First, InlineDisplay::Box::PositionWithinInlineLevelBox::Last };
> +    if (inlineBox.isFirstBox())
> +        return { InlineDisplay::Box::PositionWithinInlineLevelBox::First };
> +    if (inlineBox.isLastBox())
> +        return { InlineDisplay::Box::PositionWithinInlineLevelBox::Last };
> +    return { };

I'd do

OptionSet<InlineDisplay::Box::PositionWithinInlineLevelBox> result;
if (inlineBox.isFirstBox())
    result.add(InlineDisplay::Box::PositionWithinInlineLevelBox::First);
if (inlineBox.isLastBox())
    result.add(InlineDisplay::Box::PositionWithinInlineLevelBox::Last);
return result;

> Source/WebCore/layout/formattingContexts/inline/InlineLevelBox.h:147
> +    // These bits are about whether this inline level box is the first/last generated box of the associated Layout::Box
> +    // (e.g. always true for atomic inline level boxes, but inline boxes spanning over multiple lines can produce separate first/last boxes).
> +    bool m_isFirstWithinLayoutBox : 1;
> +    bool m_isLastWithinLayoutBox : 1;

These could move up with other bools and probably don't need to be bitfields (or all of them should be).

> Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayBox.h:135
> +    bool m_isFirstWithinInlineLevelBox : 1;
> +    bool m_isLastWithinInlineLevelBox : 1;

Same here.

[zalan]

Created attachment 440503 [details]
Patch

[EWS]

Committed r283715 (242641@main): <https://commits.webkit.org/242641@main>

All reviewed patches have been landed. Closing bug and clearing flags on attachment 440503 [details].

[Radar WebKit Bug Importer]

<rdar://problem/83982733>