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

Source/core/paint/InlineTextBoxPainter.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/paint/InlineTextBoxPainter.h"
 
 #include "core/dom/DocumentMarkerController.h"
 #include "core/dom/RenderedDocumentMarker.h"
 #include "core/editing/CompositionUnderline.h"
@@ skipping 89 matching lines @@
 
     GraphicsContext* context = paintInfo.context;
     RenderStyle* styleToUse = m_inlineTextBox.renderer().style(m_inlineTextBox.isFirstLineStyle());
 
     adjustedPaintOffset.move(0, styleToUse->isHorizontalWritingMode() ? LayoutUnit() : -m_inlineTextBox.logicalHeight().toLayoutUnit());
 
     FloatPoint boxOrigin = m_inlineTextBox.locationIncludingFlipping().toFloatPoint();
     boxOrigin.move(adjustedPaintOffset.x().toFloat(), adjustedPaintOffset.y().toFloat());
     FloatRect boxRect(boxOrigin, FloatSize(m_inlineTextBox.logicalWidth(), m_inlineTextBox.logicalHeight()));
 
-    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));
+    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));
+        }
+    }
 
     // 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();
     bool useCustomUnderlines = containsComposition && m_inlineTextBox.renderer().frame()->inputMethodController().compositionUsesCustomUnderlines();
 
     // Determine text colors.
     TextPainter::Style textStyle = TextPainter::textPaintingStyle(m_inlineTextBox.renderer(), styleToUse, paintInfo.forceBlackText(), isPrinting);
     TextPainter::Style selectionStyle = TextPainter::selectionPaintingStyle(m_inlineTextBox.renderer(), haveSelection, paintInfo.forceBlackText(), isPrinting, textStyle);
     bool paintSelectedTextOnly = (paintInfo.phase == PaintPhaseSelection);
     bool paintSelectedTextSeparately = !paintSelectedTextOnly && textStyle != selectionStyle;
@@ skipping 13 matching lines @@
         }
 
         paintDocumentMarkers(context, boxOrigin, styleToUse, font, true);
 
         if (haveSelection && !useCustomUnderlines)
             paintSelection(context, boxOrigin, styleToUse, font, selectionStyle.fillColor);
     }
 
     // 2. Now paint the foreground, including text and decorations like underline/overline (in quirks mode only).
     int length = m_inlineTextBox.len();
-    int maximumLength;
-    StringView string;
-    if (!combinedText) {
-        string = m_inlineTextBox.renderer().text().createView();
-        ASSERT(m_inlineTextBox.start() + length <= string.length());
-        if (static_cast<unsigned>(length) != string.length() || m_inlineTextBox.start())
-            string.narrow(m_inlineTextBox.start(), length);
-        maximumLength = m_inlineTextBox.renderer().textLength() - m_inlineTextBox.start();
-    } else {
-        combinedText->getStringToRender(m_inlineTextBox.start(), string, length);
-        maximumLength = length;
-    }
+    StringView string = m_inlineTextBox.renderer().text().createView();
+    ASSERT(m_inlineTextBox.start() + length <= string.length());
+    if (static_cast<unsigned>(length) != string.length() || m_inlineTextBox.start())
+        string.narrow(m_inlineTextBox.start(), length);
+    int maximumLength = m_inlineTextBox.renderer().textLength() - m_inlineTextBox.start();
 
     StringBuilder charactersWithHyphen;
     TextRun textRun = m_inlineTextBox.constructTextRun(styleToUse, font, string, maximumLength, m_inlineTextBox.hasHyphen() ? &charactersWithHyphen : 0);
     if (m_inlineTextBox.hasHyphen())
         length = textRun.length();
 
     int selectionStart = 0;
     int selectionEnd = 0;
     if (paintSelectedTextOnly || paintSelectedTextSeparately)
         m_inlineTextBox.selectionStartEnd(selectionStart, selectionEnd);
@@ skipping 626 matching lines @@
             LayoutTheme::theme().platformActiveTextSearchHighlightColor() :
             LayoutTheme::theme().platformInactiveTextSearchHighlightColor();
         GraphicsContextStateSaver stateSaver(*pt);
         pt->clip(FloatRect(boxOrigin.x(), boxOrigin.y() - deltaY, m_inlineTextBox.logicalWidth(), selHeight));
         pt->drawHighlightForText(font, run, FloatPoint(boxOrigin.x(), boxOrigin.y() - deltaY), selHeight, color, sPos, ePos);
     }
 }
 
 
 } // namespace blink