Refactor DrawingRecorders to check for cached drawings earlier

Source/core/svg/graphics/SVGImage.cpp

 /*
  * Copyright (C) 2006 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 227 matching lines @@
 {
     // Tile adjusted for scaling/stretch.
     FloatRect tile(srcRect);
     tile.scale(tileScale.width(), tileScale.height());
 
     // Expand the tile to account for repeat spacing.
     FloatRect spacedTile(tile);
     spacedTile.expand(repeatSpacing);
 
     SkPictureBuilder patternPicture(spacedTile, nullptr, context);
-    {
+    if (!DrawingRecorder::useCachedDrawingIfPossible(patternPicture.context(), *this, DisplayItem::Type::SVGImage)) {
         DrawingRecorder patternPictureRecorder(patternPicture.context(), *this, DisplayItem::Type::SVGImage, spacedTile);
-        if (!patternPictureRecorder.canUseCachedDrawing()) {
-            // When generating an expanded tile, make sure we don't draw into the spacing area.
-            if (tile != spacedTile)
-                patternPicture.context().clip(tile);
-            SkPaint paint;
-            drawForContainer(patternPicture.context().canvas(), paint, containerSize, zoom, tile, srcRect);
-        }
+        // When generating an expanded tile, make sure we don't draw into the spacing area.
+        if (tile != spacedTile)
+            patternPicture.context().clip(tile);
+        SkPaint paint;
+        drawForContainer(patternPicture.context().canvas(), paint, containerSize, zoom, tile, srcRect);
     }
     RefPtr<const SkPicture> tilePicture = patternPicture.endRecording();
 
     SkMatrix patternTransform;
     patternTransform.setTranslate(phase.x() + spacedTile.x(), phase.y() + spacedTile.y());
     RefPtr<SkShader> patternShader = adoptRef(SkShader::CreatePictureShader(
         tilePicture.get(), SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode,
         &patternTransform, nullptr));
 
     SkPaint paint;
@@ skipping 216 matching lines @@
 
     return m_page;
 }
 
 String SVGImage::filenameExtension() const
 {
     return "svg";
 }
 
 }