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

Unified Diff: Source/core/paint/TextPainter.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/paint/InlineTextBoxPainter.cpp ('k') | Source/core/rendering/RenderBlockLineLayout.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/paint/TextPainter.cpp
diff --git a/Source/core/paint/TextPainter.cpp b/Source/core/paint/TextPainter.cpp
index c489e61b13872ae54d72d029a9952c31ac373aa6..405b374e57a7d4ca8b75e5c41678cb8e76722488 100644
--- a/Source/core/paint/TextPainter.cpp
+++ b/Source/core/paint/TextPainter.cpp
@@ -55,14 +55,7 @@
{
GraphicsContextStateSaver stateSaver(*m_graphicsContext, false);
updateGraphicsContext(textStyle, stateSaver);
- if (m_combinedText && m_combinedText->isTransformNeeded()) {
- m_graphicsContext->save();
- m_combinedText->transform(*m_graphicsContext, m_textBounds);
- paintInternal<PaintText>(startOffset, endOffset, length, cachedTextBlob);
- m_graphicsContext->restore();
- } else {
- paintInternal<PaintText>(startOffset, endOffset, length, cachedTextBlob);
- }
+ paintInternal<PaintText>(startOffset, endOffset, length, cachedTextBlob);
if (!m_emphasisMark.isEmpty()) {
if (textStyle.emphasisMarkColor != textStyle.fillColor)
« no previous file with comments | « Source/core/paint/InlineTextBoxPainter.cpp ('k') | Source/core/rendering/RenderBlockLineLayout.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698