Bug 204514 – [LFC][IFC] Line::Run::expand should take a range of runs to merge

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

[alan]

instead of merging one by one

[Radar WebKit Bug Importer]

<rdar://problem/57428139>

[alan]

Created attachment 384150 [details]
Patch

[Antti Koivisto]

Comment on attachment 384150 [details]
Patch

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

> Source/WebCore/layout/inlineformatting/InlineLine.cpp:315
> +            auto& trailingRun = m_inlineItemRuns[i + 1];
> +            if (!ContinousContent::canMergeRuns(*m_inlineItemRuns[i], *trailingRun))
>                  break;
> -            runList.last().expand(*nextRun);
> -            // Skip the merged run.
> -            ++i;
> +            continousContent.append(*trailingRun);

Maybe the canMergeRuns call could be done in ContinousContent too? Like instead of append do something like

continousContent.mergeIfNeeded(*m_inlineItemRuns[i], m_inlineItemRuns[i + 1]);

[alan]

(In reply to Antti Koivisto from comment #3)
> Comment on attachment 384150 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=384150&action=review
> 
> > Source/WebCore/layout/inlineformatting/InlineLine.cpp:315
> > +            auto& trailingRun = m_inlineItemRuns[i + 1];
> > +            if (!ContinousContent::canMergeRuns(*m_inlineItemRuns[i], *trailingRun))
> >                  break;
> > -            runList.last().expand(*nextRun);
> > -            // Skip the merged run.
> > -            ++i;
> > +            continousContent.append(*trailingRun);
> 
> Maybe the canMergeRuns call could be done in ContinousContent too? Like
> instead of append do something like
> 
> continousContent.mergeIfNeeded(*m_inlineItemRuns[i], m_inlineItemRuns[i +
> 1]);
good idea!

[alan]

Created attachment 384189 [details]
Patch

[WebKit Commit Bot]

Comment on attachment 384189 [details]
Patch

Clearing flags on attachment: 384189

Committed r252807: <https://trac.webkit.org/changeset/252807>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.