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

Unified Diff: Source/core/rendering/line/LineBreaker.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
« no previous file with comments | « Source/core/rendering/line/BreakingContextInlineHeaders.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/line/LineBreaker.cpp
diff --git a/Source/core/rendering/line/LineBreaker.cpp b/Source/core/rendering/line/LineBreaker.cpp
index 5b4f2091712660af64ebbd4982a25a13952dc8a5..4f74ee5447f824e106b8ca9933aa4845fcbd52b6 100644
--- a/Source/core/rendering/line/LineBreaker.cpp
+++ b/Source/core/rendering/line/LineBreaker.cpp
@@ -43,6 +43,10 @@
}
} else if (object->isFloating()) {
m_block->positionNewFloatOnLine(m_block->insertFloatingObject(*toRenderBox(object)), lastFloatFromPreviousLine, lineInfo, width);
+ } else if (object->isText() && object->style()->hasTextCombine() && object->isCombineText() && !toRenderCombineText(object)->isCombined()) {
+ toRenderCombineText(object)->combineText();
+ if (toRenderCombineText(object)->isCombined())
+ continue;
}
resolver.position().increment(&resolver);
}
« no previous file with comments | « Source/core/rendering/line/BreakingContextInlineHeaders.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698