| Index: third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h
|
| diff --git a/third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h b/third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h
|
| index 02072ff660e53acd5f7118d9f9de34c1008cb330..ebebad9d01599323b8c70232daa9f3f82b78d692 100644
|
| --- a/third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h
|
| +++ b/third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h
|
| @@ -958,7 +958,7 @@ inline bool BreakingContext::handleText(WordMeasurements& wordMeasurements,
|
| // See: fast/css3-text/css3-word-break/word-break-all-wrap-with-floats.html
|
| float widthMeasurementAtLastBreakOpportunity = 0;
|
|
|
| - Hyphenation* hyphenation = style.getHyphenation();
|
| + Hyphenation* hyphenation = m_autoWrap ? style.getHyphenation() : nullptr;
|
| bool disableSoftHyphen = style.getHyphens() == HyphensNone;
|
| float hyphenWidth = 0;
|
| bool isLineEmpty = m_lineInfo.isEmpty();
|
|
|