Remove the text blob cache

third_party/WebKit/Source/core/paint/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 "core/paint/TextPainter.h"
 
 #include "core/CSSPropertyNames.h"
 #include "core/frame/Settings.h"
 #include "core/layout/LayoutObject.h"
 #include "core/layout/LayoutTextCombine.h"
@@ skipping 44 matching lines @@
   } else {
     DCHECK(position == TextEmphasisPositionUnder);
     m_emphasisMarkOffset = fontData->getFontMetrics().descent() +
                            m_font.emphasisMarkAscent(emphasisMark);
   }
 }
 
 void TextPainter::paint(unsigned startOffset,
                         unsigned endOffset,
                         unsigned length,
-                        const Style& textStyle,
-                        TextBlobPtr* cachedTextBlob) {
+                        const Style& textStyle) {
   GraphicsContextStateSaver stateSaver(m_graphicsContext, false);
   updateGraphicsContext(textStyle, stateSaver);
   if (m_combinedText) {
     m_graphicsContext.save();
     m_combinedText->transformToInlineCoordinates(m_graphicsContext,
                                                  m_textBounds);
-    paintInternal<PaintText>(startOffset, endOffset, length, cachedTextBlob);
+    paintInternal<PaintText>(startOffset, endOffset, length);
     m_graphicsContext.restore();
   } else {
-    paintInternal<PaintText>(startOffset, endOffset, length, cachedTextBlob);
+    paintInternal<PaintText>(startOffset, endOffset, length);
   }
 
   if (!m_emphasisMark.isEmpty()) {
     if (textStyle.emphasisMarkColor != textStyle.fillColor)
       m_graphicsContext.setFillColor(textStyle.emphasisMarkColor);
 
     if (m_combinedText)
       paintEmphasisMarkForCombinedText();
     else
       paintInternal<PaintEmphasisMark>(startOffset, endOffset, length);
@@ skipping 144 matching lines @@
   } else {
     DCHECK(step == PaintText);
     m_graphicsContext.drawText(m_font, textRunPaintInfo,
                                FloatPoint(m_textOrigin));
   }
 }
 
 template <TextPainter::PaintInternalStep Step>
 void TextPainter::paintInternal(unsigned startOffset,
                                 unsigned endOffset,
-                                unsigned truncationPoint,
-                                TextBlobPtr* cachedTextBlob) {
+                                unsigned truncationPoint) {
   TextRunPaintInfo textRunPaintInfo(m_run);
   textRunPaintInfo.bounds = FloatRect(m_textBounds);
   if (startOffset <= endOffset) {
-    // 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, m_ellipsisOffset, endOffset);
     if (startOffset < truncationPoint)
       paintInternalRun<Step>(textRunPaintInfo, startOffset, truncationPoint);
   }
 }
 
 void TextPainter::clipDecorationsStripe(float upper,
@@ skipping 43 matching lines @@
   TextRunPaintInfo textRunPaintInfo(placeholderTextRun);
   textRunPaintInfo.bounds = FloatRect(m_textBounds);
   m_graphicsContext.concatCTM(rotation(m_textBounds, Clockwise));
   m_graphicsContext.drawEmphasisMarks(m_combinedText->originalFont(),
                                       textRunPaintInfo, m_emphasisMark,
                                       emphasisMarkTextOrigin);
   m_graphicsContext.concatCTM(rotation(m_textBounds, Counterclockwise));
 }
 
 }  // namespace blink