third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h - Issue 1575333002: Fix word-wrap: break-word with fit-content not to break surrogate pairs

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 1575333002: Fix word-wrap: break-word with fit-content not to break surrogate pairs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Test was upstreamed Created 4 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 47fedc2673ba9a9436b8551af00eda63cf19667a..f7993a9fec1514d37a53c5f261822ee39d90e31b 100644

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

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

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

bool applyWordSpacing = false;

// Determine if we should try breaking in the middle of a word.

- if (breakWords && !midWordBreak) {

+ if (breakWords && !midWordBreak && !U16_IS_TRAIL(c)) {

widthFromLastBreakingOpportunity += charWidth;

bool midWordBreakIsBeforeSurrogatePair = U16_IS_LEAD(c) && m_current.offset() + 1 < layoutText.textLength() && U16_IS_TRAIL(layoutText.uncheckedCharacterAt(m_current.offset() + 1));

charWidth = textWidth(layoutText, m_current.offset(), midWordBreakIsBeforeSurrogatePair ? 2 : 1, font, m_width.committedWidth() + widthFromLastBreakingOpportunity, m_collapseWhiteSpace);

« no previous file with comments | « third_party/WebKit/LayoutTests/TestExpectations ('k') | no next file » | no next file with comments »