third_party/WebKit/Source/core/layout/LayoutText.cpp - Issue 2621563002: Merge 2924: Fix 'hyphens: auto' to work only when line wrapping is allowed

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/layout/LayoutText.cpp

Issue 2621563002: Merge 2924: Fix 'hyphens: auto' to work only when line wrapping is allowed (Closed)

Patch Set: Created 3 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: third_party/WebKit/Source/core/layout/LayoutText.cpp

diff --git a/third_party/WebKit/Source/core/layout/LayoutText.cpp b/third_party/WebKit/Source/core/layout/LayoutText.cpp

index 23ccbf0b5b6e46b4a8a9c87e885174e19b14f83d..540fe25c2a7f397e0280c7fb0a4c77bacf439d78 100644

--- a/third_party/WebKit/Source/core/layout/LayoutText.cpp

+++ b/third_party/WebKit/Source/core/layout/LayoutText.cpp

@@ -1073,7 +1073,8 @@ void LayoutText::computePreferredLogicalWidths(

bool keepAll =

styleToUse.wordBreak() == KeepAllWordBreak && styleToUse.autoWrap();

- Hyphenation* hyphenation = styleToUse.getHyphenation();

+ Hyphenation* hyphenation =

+ styleToUse.autoWrap() ? styleToUse.getHyphenation() : nullptr;

bool disableSoftHyphen = styleToUse.getHyphens() == HyphensNone;

float maxWordWidth = 0;

if (!hyphenation)