third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp - Issue 2248803002: Fix when there are justification opportunities inside text-combine-upright

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/LayoutBlockFlowLine.cpp

Issue 2248803002: Fix when there are justification opportunities inside text-combine-upright (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix Created 4 years, 4 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/LayoutTests/fast/writing-mode/text-combine-justify-expected.html ('k') | third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp » ('j') | third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 03b79473ece791291c730efa8d808e6cb86a0767..c6214833bd25037fd853e2d1d382ab4a323a9e61 100644

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

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

@@ -59,6 +59,12 @@ public:

if (text.is8Bit()) {

opportunitiesInRun = Character::expansionOpportunityCount(text.characters8() + run.m_start,

run.m_stop - run.m_start, run.m_box->direction(), isAfterExpansion, textJustify);

+ } else if (run.m_lineLayoutItem.isCombineText()) {

+ // Justfication applies to before and after the combined text as if

+ // it is an ideographic character, and is prohibited inside the

+ // combined text.

+ opportunitiesInRun = isAfterExpansion ? 1 : 2;

+ isAfterExpansion = true;

} else {

opportunitiesInRun = Character::expansionOpportunityCount(text.characters16() + run.m_start,

run.m_stop - run.m_start, run.m_box->direction(), isAfterExpansion, textJustify);