Refactor DrawingRecorders to check for cached drawings earlier

Source/core/paint/SVGInlineTextBoxPainter.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/SVGInlineTextBoxPainter.h"
 
 #include "core/dom/DocumentMarkerController.h"
 #include "core/dom/RenderedDocumentMarker.h"
 #include "core/editing/Editor.h"
@@ skipping 41 matching lines @@
     if (paintInfo.phase == PaintPhaseSelection && !shouldPaintSelection())
         return;
 
     LayoutSVGInlineText& textLayoutObject = toLayoutSVGInlineText(m_svgInlineTextBox.layoutObject());
     if (!textShouldBePainted(textLayoutObject))
         return;
 
     LayoutObject& parentLayoutObject = m_svgInlineTextBox.parent()->layoutObject();
     const ComputedStyle& style = parentLayoutObject.styleRef();
 
-    {
-        DrawingRecorder recorder(*paintInfo.context, m_svgInlineTextBox, DisplayItem::paintPhaseToDrawingType(paintInfo.phase), paintInfo.rect);
-        if (!recorder.canUseCachedDrawing()) {
-            InlineTextBoxPainter(m_svgInlineTextBox).paintDocumentMarkers(
-                paintInfo.context, paintOffset, style,
-                textLayoutObject.scaledFont(), true);
+    DisplayItem::Type displayItemType = DisplayItem::paintPhaseToDrawingType(paintInfo.phase);
+    if (!DrawingRecorder::useCachedDrawingIfPossible(*paintInfo.context, m_svgInlineTextBox, displayItemType)) {
+        DrawingRecorder recorder(*paintInfo.context, m_svgInlineTextBox, displayItemType, paintInfo.rect);
+        InlineTextBoxPainter(m_svgInlineTextBox).paintDocumentMarkers(
+            paintInfo.context, paintOffset, style,
+            textLayoutObject.scaledFont(), true);
 
-            if (!m_svgInlineTextBox.textFragments().isEmpty())
-                paintTextFragments(paintInfo, parentLayoutObject);
-        }
+        if (!m_svgInlineTextBox.textFragments().isEmpty())
+            paintTextFragments(paintInfo, parentLayoutObject);
     }
 
     if (style.hasOutline() && parentLayoutObject.isLayoutInline())
         InlinePainter(toLayoutInline(parentLayoutObject)).paintOutline(paintInfo, paintOffset);
 }
 
 void SVGInlineTextBoxPainter::paintTextFragments(const PaintInfo& paintInfo, LayoutObject& parentLayoutObject)
 {
     const ComputedStyle& style = parentLayoutObject.styleRef();
     const SVGComputedStyle& svgStyle = style.svgStyle();
@@ skipping 364 matching lines @@
                 if (!fragmentTransform.isIdentity())
                     context->concatCTM(fragmentTransform);
                 context->setFillColor(color);
                 context->fillRect(fragmentRect, color);
             }
         }
     }
 }
 
 } // namespace blink