Bug 248854 – [leading-trim][IFC] Add support for nested block containers with leading-trim: end

• Component: Layout and Rendering
• Status: RESOLVED FIXED

[alan]

ssia

[alan]

Created attachment 463913 [details]
Patch

[alan]

Created attachment 463915 [details]
Patch

[Antti Koivisto]

Comment on attachment 463915 [details]
Patch

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

> Source/WebCore/rendering/RenderBlockFlow.cpp:725
> +    if (childrenInline()) {
> +        setLeadingTrimForSubtree(this);
> +        layoutInlineChildren(relayoutChildren, repaintLogicalTop, repaintLogicalBottom);
> +        adjustLeadingTrimAfterLayout();
> +        return;
> +    }
> +
> +    // With block children, there's no way to tell what the last formatted line is until after we finished laying out the subtree.
> +    setLeadingTrimForSubtree();
> +    layoutBlockChildren(relayoutChildren, maxFloatLogicalBottom);
> +    adjustLeadingTrimAfterLayout();

setLeadingTrimForSubtree(this) vs setLeadingTrimForSubtree() is but subtle.

Maybe a stack helper (LeadingTrimmer!) could make this bit less intrusive.

[alan]

(In reply to Antti Koivisto from comment #3)
> Comment on attachment 463915 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=463915&action=review
> 
> > Source/WebCore/rendering/RenderBlockFlow.cpp:725
> > +    if (childrenInline()) {
> > +        setLeadingTrimForSubtree(this);
> > +        layoutInlineChildren(relayoutChildren, repaintLogicalTop, repaintLogicalBottom);
> > +        adjustLeadingTrimAfterLayout();
> > +        return;
> > +    }
> > +
> > +    // With block children, there's no way to tell what the last formatted line is until after we finished laying out the subtree.
> > +    setLeadingTrimForSubtree();
> > +    layoutBlockChildren(relayoutChildren, maxFloatLogicalBottom);
> > +    adjustLeadingTrimAfterLayout();
> 
> setLeadingTrimForSubtree(this) vs setLeadingTrimForSubtree() is but subtle.
> 
> Maybe a stack helper (LeadingTrimmer!) could make this bit less intrusive.
yeah, good point!

[alan]

Created attachment 463925 [details]
[fast-cq]Patch

[alan]

Created attachment 463929 [details]
[fast-cq]Patch

[EWS]

Committed 257526@main (be3537314eb4): <https://commits.webkit.org/257526@main>

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

[Radar WebKit Bug Importer]

<rdar://problem/103097237>