Refactor DrawingRecorders to check for cached drawings earlier

Source/core/paint/SVGShapePainter.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/SVGShapePainter.h"
 
 #include "core/layout/svg/LayoutSVGPath.h"
 #include "core/layout/svg/LayoutSVGResourceMarker.h"
 #include "core/layout/svg/LayoutSVGShape.h"
@@ skipping 39 matching lines @@
 
     FloatRect boundingBox = m_layoutSVGShape.paintInvalidationRectInLocalCoordinates();
     if (!paintInfo.intersectsCullRect(m_layoutSVGShape.localTransform(), boundingBox))
         return;
 
     PaintInfo paintInfoBeforeFiltering(paintInfo);
     // Shapes cannot have children so do not call updateCullRectForSVGTransform.
     TransformRecorder transformRecorder(*paintInfoBeforeFiltering.context, m_layoutSVGShape, m_layoutSVGShape.localTransform());
     {
         SVGPaintContext paintContext(m_layoutSVGShape, paintInfoBeforeFiltering);
-        if (paintContext.applyClipMaskAndFilterIfNecessary()) {
+        if (paintContext.applyClipMaskAndFilterIfNecessary() && !LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(*paintContext.paintInfo().context, m_layoutSVGShape, paintContext.paintInfo().phase)) {
             LayoutObjectDrawingRecorder recorder(*paintContext.paintInfo().context, m_layoutSVGShape, paintContext.paintInfo().phase, boundingBox);
-            if (!recorder.canUseCachedDrawing()) {
-                const SVGComputedStyle& svgStyle = m_layoutSVGShape.style()->svgStyle();
+            const SVGComputedStyle& svgStyle = m_layoutSVGShape.style()->svgStyle();
 
-                bool shouldAntiAlias = svgStyle.shapeRendering() != SR_CRISPEDGES;
+            bool shouldAntiAlias = svgStyle.shapeRendering() != SR_CRISPEDGES;
 
-                for (int i = 0; i < 3; i++) {
-                    switch (svgStyle.paintOrderType(i)) {
-                    case PT_FILL: {
-                        SkPaint fillPaint;
-                        if (!SVGPaintContext::paintForLayoutObject(paintContext.paintInfo(), m_layoutSVGShape.styleRef(), m_layoutSVGShape, ApplyToFillMode, fillPaint))
+            for (int i = 0; i < 3; i++) {
+                switch (svgStyle.paintOrderType(i)) {
+                case PT_FILL: {
+                    SkPaint fillPaint;
+                    if (!SVGPaintContext::paintForLayoutObject(paintContext.paintInfo(), m_layoutSVGShape.styleRef(), m_layoutSVGShape, ApplyToFillMode, fillPaint))
+                        break;
+                    fillPaint.setAntiAlias(shouldAntiAlias);
+                    fillShape(paintContext.paintInfo().context, fillPaint, fillRuleFromStyle(paintContext.paintInfo(), svgStyle));
+                    break;
+                }
+                case PT_STROKE:
+                    if (svgStyle.hasVisibleStroke()) {
+                        GraphicsContextStateSaver stateSaver(*paintContext.paintInfo().context, false);
+                        AffineTransform nonScalingTransform;
+                        const AffineTransform* additionalPaintServerTransform = 0;
+
+                        if (m_layoutSVGShape.hasNonScalingStroke()) {
+                            nonScalingTransform = m_layoutSVGShape.nonScalingStrokeTransform();
+                            if (!setupNonScalingStrokeContext(nonScalingTransform, stateSaver))
+                                return;
+
+                            // Non-scaling stroke needs to reset the transform back to the host transform.
+                            additionalPaintServerTransform = &nonScalingTransform;
+                        }
+
+                        SkPaint strokePaint;
+                        if (!SVGPaintContext::paintForLayoutObject(paintContext.paintInfo(), m_layoutSVGShape.styleRef(), m_layoutSVGShape, ApplyToStrokeMode, strokePaint, additionalPaintServerTransform))
                             break;
-                        fillPaint.setAntiAlias(shouldAntiAlias);
-                        fillShape(paintContext.paintInfo().context, fillPaint, fillRuleFromStyle(paintContext.paintInfo(), svgStyle));
-                        break;
+                        strokePaint.setAntiAlias(shouldAntiAlias);
+
+                        StrokeData strokeData;
+                        SVGLayoutSupport::applyStrokeStyleToStrokeData(strokeData, m_layoutSVGShape.styleRef(), m_layoutSVGShape);
+                        strokeData.setupPaint(&strokePaint);
+
+                        strokeShape(paintContext.paintInfo().context, strokePaint);
                     }
-                    case PT_STROKE:
-                        if (svgStyle.hasVisibleStroke()) {
-                            GraphicsContextStateSaver stateSaver(*paintContext.paintInfo().context, false);
-                            AffineTransform nonScalingTransform;
-                            const AffineTransform* additionalPaintServerTransform = 0;
-
-                            if (m_layoutSVGShape.hasNonScalingStroke()) {
-                                nonScalingTransform = m_layoutSVGShape.nonScalingStrokeTransform();
-                                if (!setupNonScalingStrokeContext(nonScalingTransform, stateSaver))
-                                    return;
-
-                                // Non-scaling stroke needs to reset the transform back to the host transform.
-                                additionalPaintServerTransform = &nonScalingTransform;
-                            }
-
-                            SkPaint strokePaint;
-                            if (!SVGPaintContext::paintForLayoutObject(paintContext.paintInfo(), m_layoutSVGShape.styleRef(), m_layoutSVGShape, ApplyToStrokeMode, strokePaint, additionalPaintServerTransform))
-                                break;
-                            strokePaint.setAntiAlias(shouldAntiAlias);
-
-                            StrokeData strokeData;
-                            SVGLayoutSupport::applyStrokeStyleToStrokeData(strokeData, m_layoutSVGShape.styleRef(), m_layoutSVGShape);
-                            strokeData.setupPaint(&strokePaint);
-
-                            strokeShape(paintContext.paintInfo().context, strokePaint);
-                        }
-                        break;
-                    case PT_MARKERS:
-                        paintMarkers(paintContext.paintInfo(), boundingBox);
-                        break;
-                    default:
-                        ASSERT_NOT_REACHED();
-                        break;
-                    }
+                    break;
+                case PT_MARKERS:
+                    paintMarkers(paintContext.paintInfo(), boundingBox);
+                    break;
+                default:
+                    ASSERT_NOT_REACHED();
+                    break;
                 }
             }
         }
     }
 
     if (m_layoutSVGShape.style()->outlineWidth()) {
         PaintInfo outlinePaintInfo(paintInfoBeforeFiltering);
         outlinePaintInfo.phase = PaintPhaseSelfOutline;
         LayoutRect layoutObjectBounds(boundingBox);
         LayoutRect visualOverflowRect = ObjectPainter::outlineBounds(layoutObjectBounds, m_layoutSVGShape.styleRef());
@@ skipping 135 matching lines @@
             position = nonScalingTransform.mapPoint(position);
         FloatRect subpathRect = LayoutSVGPath::zeroLengthSubpathRect(position, m_layoutSVGShape.strokeWidth());
         if (m_layoutSVGShape.style()->svgStyle().capStyle() == SquareCap)
             context->drawRect(subpathRect, fillPaint);
         else
             context->drawOval(subpathRect, fillPaint);
     }
 }
 
 } // namespace blink