Refactor DrawingRecorders to check for cached drawings earlier

Source/web/WebLocalFrameImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 377 matching lines @@
         size_t numPages = pageRects().size();
         int totalHeight = numPages * (pageSizeInPixels.height() + 1) - 1;
         IntRect allPagesRect(0, 0, pageWidth, totalHeight);
 
         SkPictureBuilder pictureBuilder(allPagesRect, &skia::getMetaData(*canvas));
         pictureBuilder.context().setPrinting(true);
 
         GraphicsContext& context = pictureBuilder.context();
 
         // Fill the whole background by white.
-        {
+        if (!DrawingRecorder::useCachedDrawingIfPossible(context, *this, DisplayItem::PrintedContentBackground)) {
             DrawingRecorder backgroundRecorder(context, *this, DisplayItem::PrintedContentBackground, allPagesRect);
-            if (!backgroundRecorder.canUseCachedDrawing())
-                context.fillRect(FloatRect(0, 0, pageWidth, totalHeight), Color::white);
+            context.fillRect(FloatRect(0, 0, pageWidth, totalHeight), Color::white);
         }
 
         int currentHeight = 0;
         for (size_t pageIndex = 0; pageIndex < numPages; pageIndex++) {
             ScopeRecorder scopeRecorder(context, *this);
             // Draw a line for a page boundary if this isn't the first page.
-            if (pageIndex > 0) {
+            if (pageIndex > 0 && !DrawingRecorder::useCachedDrawingIfPossible(context, *this, DisplayItem::PrintedContentLineBoundary)) {
                 DrawingRecorder lineBoundaryRecorder(context, *this, DisplayItem::PrintedContentLineBoundary, allPagesRect);
-                if (!lineBoundaryRecorder.canUseCachedDrawing()) {
-                    context.save();
-                    context.setStrokeColor(Color(0, 0, 255));
-                    context.setFillColor(Color(0, 0, 255));
-                    context.drawLine(IntPoint(0, currentHeight), IntPoint(pageWidth, currentHeight));
-                    context.restore();
-                }
+                context.save();
+                context.setStrokeColor(Color(0, 0, 255));
+                context.setFillColor(Color(0, 0, 255));
+                context.drawLine(IntPoint(0, currentHeight), IntPoint(pageWidth, currentHeight));
+                context.restore();
             }
 
             AffineTransform transform;
             transform.translate(0, currentHeight);
 #if OS(WIN) || OS(MACOSX)
             // Account for the disabling of scaling in spoolPage. In the context
             // of spoolAllPagesWithBoundaries the scale HAS NOT been pre-applied.
             float scale = getPageShrink(pageIndex);
             transform.scale(scale, scale);
 #endif
@@ skipping 1762 matching lines @@
 }
 
 WebSandboxFlags WebLocalFrameImpl::effectiveSandboxFlags() const
 {
     if (!frame())
         return WebSandboxFlags::None;
     return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags());
 }
 
 } // namespace blink