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

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:

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

Download patch

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 513b3b414de99d61155bc7e21a7bdb49266043d0..91ae3c100637de2de49566eceaa8230a2f3aa0e5 100644

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

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

@@ -946,7 +946,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();

« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutText.cpp ('k') | no next file » | no next file with comments »