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

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

Issue 622653002: Force ComplexPath if any part of the node requires it (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Patch for landing Created 6 years, 3 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
diff --git a/Source/core/rendering/RenderText.cpp b/Source/core/rendering/RenderText.cpp
index 231b291e47e27177996cb70afad0a4dda7b87f79..871a8c9a6d32a2e5051cd3019664830d645171f0 100644
--- a/Source/core/rendering/RenderText.cpp
+++ b/Source/core/rendering/RenderText.cpp
@@ -928,7 +928,6 @@ void RenderText::computePreferredLogicalWidths(float leadWidth, HashSet<const Si
TextRun textRun(text());
BidiResolver<TextRunIterator, BidiCharacterRun> bidiResolver;
-
BidiCharacterRun* run;
TextDirection textDirection = styleToUse->direction();
if (isOverride(styleToUse->unicodeBidi())) {
@@ -1107,6 +1106,7 @@ void RenderText::computePreferredLogicalWidths(float leadWidth, HashSet<const Si
} 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