| Index: Source/core/layout/line/BreakingContextInlineHeaders.h
|
| diff --git a/Source/core/layout/line/BreakingContextInlineHeaders.h b/Source/core/layout/line/BreakingContextInlineHeaders.h
|
| index a33c7bb57207c4f5f2262173fe2ab28b993a9ff7..f9b1111d4650169bee8e04ee61634bb8ba8bd04e 100644
|
| --- a/Source/core/layout/line/BreakingContextInlineHeaders.h
|
| +++ b/Source/core/layout/line/BreakingContextInlineHeaders.h
|
| @@ -496,13 +496,6 @@ inline float firstPositiveWidth(const WordMeasurements& wordMeasurements)
|
| return 0;
|
| }
|
|
|
| -inline float measureHyphenWidth(LayoutText* layoutText, const Font& font, TextDirection textDirection)
|
| -{
|
| - const ComputedStyle& style = layoutText->styleRef();
|
| - return font.width(constructTextRun(layoutText, font,
|
| - style.hyphenString().string(), style, style.direction()));
|
| -}
|
| -
|
| ALWAYS_INLINE TextDirection textDirectionFromUnicode(WTF::Unicode::Direction direction)
|
| {
|
| return direction == WTF::Unicode::RightToLeft
|
| @@ -594,7 +587,7 @@ inline bool BreakingContext::handleText(WordMeasurements& wordMeasurements, bool
|
| m_lineInfo.setEmpty(false, m_block, &m_width);
|
|
|
| if (c == softHyphenCharacter && m_autoWrap && !hyphenWidth) {
|
| - hyphenWidth = measureHyphenWidth(layoutText, font, textDirectionFromUnicode(m_resolver.position().direction()));
|
| + hyphenWidth = LayoutText::hyphenWidth(layoutText, font, textDirectionFromUnicode(m_resolver.position().direction()));
|
| m_width.addUncommittedWidth(hyphenWidth);
|
| }
|
|
|
|
|