Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Unified Diff: Source/core/rendering/RenderText.cpp

Issue 616703004: Merge 183104 "Force ComplexPath if any part of the node requires it" (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/2171/
Patch Set: Created 6 years, 2 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/RenderText.cpp
===================================================================
--- Source/core/rendering/RenderText.cpp (revision 183159)
+++ Source/core/rendering/RenderText.cpp (working copy)
@@ -928,7 +928,6 @@
TextRun textRun(text());
BidiResolver<TextRunIterator, BidiCharacterRun> bidiResolver;
-
BidiCharacterRun* run;
TextDirection textDirection = styleToUse->direction();
if (isOverride(styleToUse->unicodeBidi())) {
@@ -1107,6 +1106,7 @@
} else {
TextRun run = constructTextRun(this, f, this, i, 1, styleToUse, textDirection);
run.setCharactersLength(len - i);
+ run.setUseComplexCodePath(!canUseSimpleFontCodePath());
ASSERT(run.charactersLength() >= run.length());
run.setTabSize(!style()->collapseWhiteSpace(), style()->tabSize());
run.setXPos(leadWidth + currMaxWidth);

Powered by Google App Engine
This is Rietveld 408576698