Revert of text-combine should scale rather than fall back to none when wide

Source/core/paint/InlineTextBoxPainter.cpp

Index: Source/core/paint/InlineTextBoxPainter.cpp
diff --git a/Source/core/paint/InlineTextBoxPainter.cpp b/Source/core/paint/InlineTextBoxPainter.cpp
index 7ba8e9e40235341ad97756ccc93c1413fbd9593b..da82452c85bb6e9c7b73f535b654df63a13fcdee 100644
--- a/Source/core/paint/InlineTextBoxPainter.cpp
+++ b/Source/core/paint/InlineTextBoxPainter.cpp
@@ -107,21 +107,11 @@
     boxOrigin.move(adjustedPaintOffset.x().toFloat(), adjustedPaintOffset.y().toFloat());
     FloatRect boxRect(boxOrigin, FloatSize(m_inlineTextBox.logicalWidth(), m_inlineTextBox.logicalHeight()));
 
-    bool shouldRotate = false;
-    RenderCombineText* combinedText = nullptr;
-    if (!m_inlineTextBox.isHorizontal()) {
-        if (styleToUse->hasTextCombine() && m_inlineTextBox.renderer().isCombineText()) {
-            combinedText = &toRenderCombineText(m_inlineTextBox.renderer());
-            if (!combinedText->isCombined())
-                combinedText = nullptr;
-        }
-        if (combinedText) {
-            combinedText->updateFont();
-        } else {
-            shouldRotate = true;
-            context->concatCTM(TextPainter::rotation(boxRect, TextPainter::Clockwise));
-        }
-    }
+    RenderCombineText* combinedText = styleToUse->hasTextCombine() && m_inlineTextBox.renderer().isCombineText() && toRenderCombineText(m_inlineTextBox.renderer()).isCombined() ? &toRenderCombineText(m_inlineTextBox.renderer()) : 0;
+
+    bool shouldRotate = !m_inlineTextBox.isHorizontal() && !combinedText;
+    if (shouldRotate)
+        context->concatCTM(TextPainter::rotation(boxRect, TextPainter::Clockwise));
 
     // Determine whether or not we have composition underlines to draw.
     bool containsComposition = m_inlineTextBox.renderer().node() && m_inlineTextBox.renderer().frame()->inputMethodController().compositionNode() == m_inlineTextBox.renderer().node();