third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h - 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/line/BreakingContextInlineHeaders.h

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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutText.cpp ('k') | third_party/WebKit/Source/core/style/ComputedStyle.h » ('j') | third_party/WebKit/Source/platform/fonts/FontDescription.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 cebc93ebd42d1d9a1c77a7ec637e546bf85ce6c9..ab93e174b62dbebbaac7060af152ea51b5bc9060 100644

--- a/third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h

+++ b/third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h

@@ -735,8 +735,7 @@ inline bool BreakingContext::handleText(WordMeasurements& wordMeasurements, bool

// See: fast/css3-text/css3-word-break/word-break-all-wrap-with-floats.html

float widthMeasurementAtLastBreakOpportunity = 0;

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

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

+ Hyphenation* hyphenation = style.getHyphenation();

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

float hyphenWidth = 0;