Source/core/rendering/RenderBlockLineLayout.cpp - Issue 881133003: Revert of text-combine should scale rather than fall back to none when wide

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: Source/core/rendering/RenderBlockLineLayout.cpp

Issue 881133003: Revert of text-combine should scale rather than fall back to none when wide (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 5 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: Source/core/rendering/RenderBlockLineLayout.cpp

diff --git a/Source/core/rendering/RenderBlockLineLayout.cpp b/Source/core/rendering/RenderBlockLineLayout.cpp

index 1acdf488001daf8ff8675a3091f0bc3d78116b22..122f09ea3548110074599f5e8b2b4553264b87b7 100644

--- a/Source/core/rendering/RenderBlockLineLayout.cpp

+++ b/Source/core/rendering/RenderBlockLineLayout.cpp

@@ -1397,6 +1397,9 @@

continue;

}

+ if (t->style()->hasTextCombine() && t->isCombineText())

+ toRenderCombineText(t)->combineText();

// Determine if we have a breakable character. Pass in

// whether or not we should ignore any spaces at the front

// of the string. If those are going to be stripped out,

« no previous file with comments | « Source/core/paint/TextPainter.cpp ('k') | Source/core/rendering/RenderCombineText.h » ('j') | no next file with comments »