Consolidate most simple vs. complex Font methods

Source/core/rendering/TextPainter.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/rendering/TextPainter.h"
 
 #include "core/CSSPropertyNames.h"
 #include "core/frame/Settings.h"
 #include "core/rendering/InlineTextBox.h"
@@ skipping 154 matching lines @@
 
         // Text shadows are disabled when printing. http://crbug.com/258321
         if (isPrinting)
             selectionStyle.shadow = 0;
     }
 
     return selectionStyle;
 }
 
 template <TextPainter::PaintInternalStep step>
-void TextPainter::paintInternalRun(TextRunPaintInfo& textRunPaintInfo, int from, int to, TextBlobPtr* cachedTextBlob)
+void TextPainter::paintInternalRun(TextRunPaintInfo& textRunPaintInfo, int from, int to)
 {
     textRunPaintInfo.from = from;
     textRunPaintInfo.to = to;
 
     if (step == PaintEmphasisMark) {
-        m_graphicsContext->drawEmphasisMarks(m_font, textRunPaintInfo, m_emphasisMark, m_textOrigin + IntSize(0, m_emphasisMarkOffset));
-        return;
+        m_graphicsContext->drawEmphasisMarks(m_font, textRunPaintInfo, m_emphasisMark,
+            m_textOrigin + IntSize(0, m_emphasisMarkOffset));
+    } else {
+        ASSERT(step == PaintText);
+        m_graphicsContext->drawText(m_font, textRunPaintInfo, m_textOrigin);
     }
-
-    ASSERT(step == PaintText);
-
-    TextBlobPtr localTextBlob;
-    TextBlobPtr& textBlob = cachedTextBlob ? *cachedTextBlob : localTextBlob;
-    bool canUseTextBlobs = RuntimeEnabledFeatures::textBlobEnabled();
-
-    if (canUseTextBlobs && !textBlob)
-        textBlob = m_font.buildTextBlob(textRunPaintInfo, m_textOrigin, m_graphicsContext->couldUseLCDRenderedText());
-
-    if (canUseTextBlobs && textBlob)
-        m_font.drawTextBlob(m_graphicsContext, textBlob.get(), m_textOrigin.data());
-    else
-        m_graphicsContext->drawText(m_font, textRunPaintInfo, m_textOrigin);
 }
 
 template <TextPainter::PaintInternalStep Step>
 void TextPainter::paintInternal(int startOffset, int endOffset, int truncationPoint, TextBlobPtr* cachedTextBlob)
 {
-    // FIXME: We should be able to use cachedTextBlob in more cases.
     TextRunPaintInfo textRunPaintInfo(m_run);
     textRunPaintInfo.bounds = m_textBounds;
     if (startOffset <= endOffset) {
-        paintInternalRun<Step>(textRunPaintInfo, startOffset, endOffset, cachedTextBlob);
+        // FIXME: We should be able to use cachedTextBlob in more cases.
+        textRunPaintInfo.cachedTextBlob = cachedTextBlob;
+        paintInternalRun<Step>(textRunPaintInfo, startOffset, endOffset);
     } else {
         if (endOffset > 0)
             paintInternalRun<Step>(textRunPaintInfo, 0, endOffset);
         if (startOffset < truncationPoint)
             paintInternalRun<Step>(textRunPaintInfo, startOffset, truncationPoint);
     }
 }
 
 void TextPainter::paintEmphasisMarkForCombinedText()
 {
     ASSERT(m_combinedText);
     DEFINE_STATIC_LOCAL(TextRun, placeholderTextRun, (&ideographicFullStop, 1));
     FloatPoint emphasisMarkTextOrigin(m_textBounds.x(), m_textBounds.y() + m_font.fontMetrics().ascent() + m_emphasisMarkOffset);
     TextRunPaintInfo textRunPaintInfo(placeholderTextRun);
     textRunPaintInfo.bounds = m_textBounds;
     m_graphicsContext->concatCTM(InlineTextBox::rotation(m_textBounds, InlineTextBox::Clockwise));
     m_graphicsContext->drawEmphasisMarks(m_combinedText->originalFont(), textRunPaintInfo, m_emphasisMark, emphasisMarkTextOrigin);
     m_graphicsContext->concatCTM(InlineTextBox::rotation(m_textBounds, InlineTextBox::Counterclockwise));
 }
 
 } // namespace blink