Remove the text blob cache

third_party/WebKit/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 "core/paint/InlineTextBoxPainter.h"
 
 #include "core/editing/CompositionUnderline.h"
 #include "core/editing/Editor.h"
 #include "core/editing/markers/DocumentMarkerController.h"
 #include "core/frame/LocalFrame.h"
@@ skipping 424 matching lines @@
     for (float x = x1; x + 2 * step <= x2;) {
       controlPoint1.setX(x + step);
       controlPoint2.setX(x + step);
       x += 2 * step;
       path.addBezierCurveTo(controlPoint1, controlPoint2, FloatPoint(x, yAxis));
     }
   }
   return path;
 }
 
-typedef WTF::HashMap<const InlineTextBox*, TextBlobPtr>
-    InlineTextBoxBlobCacheMap;
-static InlineTextBoxBlobCacheMap* gTextBlobCache;
-
 static const int misspellingLineThickness = 3;
 
-void InlineTextBoxPainter::removeFromTextBlobCache(
-    const InlineTextBox& inlineTextBox) {
-  if (gTextBlobCache)
-    gTextBlobCache->remove(&inlineTextBox);
-}
-
-static TextBlobPtr* addToTextBlobCache(const InlineTextBox& inlineTextBox) {
-  if (!gTextBlobCache)
-    gTextBlobCache = new InlineTextBoxBlobCacheMap;
-  return &gTextBlobCache->insert(&inlineTextBox, nullptr).storedValue->value;
-}
-
 LayoutObject& InlineTextBoxPainter::inlineLayoutObject() const {
   return *LineLayoutAPIShim::layoutObjectFrom(
       m_inlineTextBox.getLineLayoutItem());
 }
 
 bool InlineTextBoxPainter::paintsMarkerHighlights(
     const LayoutObject& layoutObject) {
   return layoutObject.node() &&
          layoutObject.document().markers().hasMarkers(layoutObject.node());
 }
@@ skipping 212 matching lines @@
     if (m_inlineTextBox.truncation() != cNoTruncation && ltr != flowIsLTR) {
       startOffset = m_inlineTextBox.truncation();
       endOffset = textRun.length();
     }
 
     if (paintSelectedTextSeparately && selectionStart < selectionEnd) {
       startOffset = selectionEnd;
       endOffset = selectionStart;
     }
 
-    // FIXME: This cache should probably ultimately be held somewhere else.
-    // A hashmap is convenient to avoid a memory hit when the
-    // RuntimeEnabledFeature is off.
-    bool textBlobIsCacheable = startOffset == 0 && endOffset == length;
-    TextBlobPtr* cachedTextBlob = 0;
-    if (textBlobIsCacheable)
-      cachedTextBlob = addToTextBlobCache(m_inlineTextBox);
-    textPainter.paint(startOffset, endOffset, length, textStyle,
-                      cachedTextBlob);
+    textPainter.paint(startOffset, endOffset, length, textStyle);
   }
 
   if ((paintSelectedTextOnly || paintSelectedTextSeparately) &&
       selectionStart < selectionEnd) {
     // paint only the text that is selected
-    bool textBlobIsCacheable = selectionStart == 0 && selectionEnd == length;
-    TextBlobPtr* cachedTextBlob = 0;
-    if (textBlobIsCacheable)
-      cachedTextBlob = addToTextBlobCache(m_inlineTextBox);
-    textPainter.paint(selectionStart, selectionEnd, length, selectionStyle,
-                      cachedTextBlob);
+    textPainter.paint(selectionStart, selectionEnd, length, selectionStyle);
   }
 
   // Paint decorations
   if (styleToUse.textDecorationsInEffect() != TextDecorationNone &&
       !paintSelectedTextOnly) {
     GraphicsContextStateSaver stateSaver(context, false);
 
     TextPainter::updateGraphicsContext(
         context, textStyle, m_inlineTextBox.isHorizontal(), stateSaver);
 
@@ skipping 633 matching lines @@
   textStyle.shadow = 0;
 
   LayoutRect boxRect(boxOrigin, LayoutSize(m_inlineTextBox.logicalWidth(),
                                            m_inlineTextBox.logicalHeight()));
   LayoutPoint textOrigin(boxOrigin.x(),
                          boxOrigin.y() + fontData->getFontMetrics().ascent());
   TextPainter textPainter(paintInfo.context, font, run, textOrigin, boxRect,
                           m_inlineTextBox.isHorizontal());
 
   textPainter.paint(paintOffsets.first, paintOffsets.second,
-                    m_inlineTextBox.len(), textStyle, 0);
+                    m_inlineTextBox.len(), textStyle);
 }
 
 void InlineTextBoxPainter::paintTextMatchMarkerBackground(
     const PaintInfo& paintInfo,
     const LayoutPoint& boxOrigin,
     const DocumentMarker& marker,
     const ComputedStyle& style,
     const Font& font) {
   if (!LineLayoutAPIShim::layoutObjectFrom(m_inlineTextBox.getLineLayoutItem())
            ->frame()
@@ skipping 11 matching lines @@
 
   LayoutRect boxRect(boxOrigin, LayoutSize(m_inlineTextBox.logicalWidth(),
                                            m_inlineTextBox.logicalHeight()));
   context.clip(FloatRect(boxRect));
   context.drawHighlightForText(font, run, FloatPoint(boxOrigin),
                                boxRect.height().toInt(), color,
                                paintOffsets.first, paintOffsets.second);
 }
 
 }  // namespace blink