Bug 167446 – Simple line layout: Add support for -webkit-hyphenate-limit-lines

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

[alan]

rdar://problem/30194030

[alan]

Created attachment 299791 [details]
WIP patch

WIP patch.

[alan]

Created attachment 299822 [details]
Patch

[Antti Koivisto]

Comment on attachment 299822 [details]
Patch

r=me

[Antti Koivisto]

Comment on attachment 299822 [details]
Patch

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

> Source/WebCore/rendering/SimpleLineLayout.cpp:651
> +        bool shouldHyphenate = style.shouldHyphenate && (!style.hyphenLimitLines || fragmentToSplit.wrappingWithHyphenCounter() < *style.hyphenLimitLines);
> +        if (shouldHyphenate && enoughWidthForHyphenation(availableWidth, style.font.pixelSize())) {
> +            // We might be able to fit the hyphen at the split position.
> +            auto splitPositionWithHyphen = splitPosition;
> +            // Find a splitting position where hyphen surely fits.
> +            auto leftSideWidth = textFragmentIterator.textWidth(start, splitPosition, 0);
> +            while (leftSideWidth + style.hyphenStringWidth > availableWidth) {
> +                if (--splitPositionWithHyphen <= start)
> +                    break; // No space for hyphen.
> +                leftSideWidth -= textFragmentIterator.textWidth(splitPositionWithHyphen, splitPositionWithHyphen + 1, 0);
> +            }
> +            if (splitPositionWithHyphen > start) {
> +                if (auto hyphenPosition = textFragmentIterator.lastHyphenPosition(fragmentToSplit, splitPositionWithHyphen + 1))
> +                    return fragmentToSplit.splitWithHyphen(*hyphenPosition, textFragmentIterator);
> +            }
>          }

Maybe the hyphenation branch could go to a helper function?

[alan]

Created attachment 299835 [details]
Patch

[WebKit Commit Bot]

Comment on attachment 299835 [details]
Patch

Clearing flags on attachment: 299835

Committed r211228: <http://trac.webkit.org/changeset/211228>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.