Refactor DrawingRecorders to check for cached drawings earlier

Source/core/paint/FramePainter.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/FramePainter.h"
 
 #include "core/dom/DocumentMarkerController.h"
 #include "core/fetch/MemoryCache.h"
 #include "core/frame/FrameView.h"
@@ skipping 62 matching lines @@
         fillWithRed = false; // Subframe, don't fill with red.
     else if (m_frameView.isTransparent())
         fillWithRed = false; // Transparent, don't fill with red.
     else if (m_frameView.paintBehavior() & PaintBehaviorSelectionOnly)
         fillWithRed = false; // Selections are transparent, don't fill with red.
     else if (m_frameView.nodeToDraw())
         fillWithRed = false; // Element images are transparent, don't fill with red.
     else
         fillWithRed = true;
 
-    if (fillWithRed) {
+    if (fillWithRed && !LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(*context, *m_frameView.layoutView(), DisplayItem::DebugRedFill)) {
         IntRect contentRect(IntPoint(), m_frameView.contentsSize());
         LayoutObjectDrawingRecorder drawingRecorder(*context, *m_frameView.layoutView(), DisplayItem::DebugRedFill, contentRect);
-        if (!drawingRecorder.canUseCachedDrawing())
-            context->fillRect(contentRect, Color(0xFF, 0, 0));
     }
 #endif
 
     LayoutView* layoutView = m_frameView.layoutView();
     if (!layoutView) {
         WTF_LOG_ERROR("called FramePainter::paint with nil layoutObject");
         return;
     }
 
     RELEASE_ASSERT(!m_frameView.needsLayout());
@@ skipping 67 matching lines @@
     if (m_frameView.layerForScrollCorner())
         return;
 
     paintScrollCorner(context, m_frameView.scrollCornerRect());
 }
 
 void FramePainter::paintScrollCorner(GraphicsContext* context, const IntRect& cornerRect)
 {
     if (m_frameView.scrollCorner()) {
         bool needsBackground = m_frameView.frame().isMainFrame();
-        if (needsBackground) {
+        if (needsBackground && !LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(*context, *m_frameView.layoutView(), DisplayItem::ScrollbarCorner)) {
             LayoutObjectDrawingRecorder drawingRecorder(*context, *m_frameView.layoutView(), DisplayItem::ScrollbarCorner, cornerRect);
-            if (!drawingRecorder.canUseCachedDrawing())
-                context->fillRect(cornerRect, m_frameView.baseBackgroundColor());
+            context->fillRect(cornerRect, m_frameView.baseBackgroundColor());
+
         }
         ScrollbarPainter::paintIntoRect(m_frameView.scrollCorner(), context, cornerRect.location(), LayoutRect(cornerRect));
         return;
     }
 
     ScrollbarTheme::theme()->paintScrollCorner(context, *m_frameView.layoutView(), cornerRect);
 }
 
 void FramePainter::paintScrollbar(GraphicsContext* context, Scrollbar* bar, const IntRect& rect)
 {
     bool needsBackground = bar->isCustomScrollbar() && m_frameView.frame().isMainFrame();
     if (needsBackground) {
         IntRect toFill = bar->frameRect();
         toFill.intersect(rect);
         context->fillRect(toFill, m_frameView.baseBackgroundColor());
     }
 
     bar->paint(context, rect);
 }
 
 } // namespace blink