third_party/WebKit/Source/core/layout/LayoutText.cpp - Issue 2161683002: Add LayoutLocale class

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 2161683002: Add LayoutLocale class (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: unittest fix Created 4 years, 5 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 8aa720adbd93961e9216ea85169f0cf31e2739dc..217a32e7d488d0f6c70c7219adfd58456a803c81 100644

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

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

@@ -927,8 +927,7 @@ void LayoutText::computePreferredLogicalWidths(float leadWidth, HashSet<const Si

bool breakAll = (styleToUse.wordBreak() == BreakAllWordBreak || styleToUse.wordBreak() == BreakWordBreak) && styleToUse.autoWrap();

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

- Hyphenation* hyphenation = styleToUse.getHyphens() == HyphensAuto

- ? Hyphenation::get(f.getFontDescription().locale()) : nullptr;

+ Hyphenation* hyphenation = styleToUse.getHyphenation();

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

float maxWordWidth = 0;

if (!hyphenation)