Fold DisplayItem creation into paintFilteredContent in SVGFilterPainter

third_party/WebKit/Source/core/paint/SVGFilterPainter.cpp

 // Copyright 2015 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 "core/paint/SVGFilterPainter.h"
 
 #include "core/layout/svg/LayoutSVGResourceFilter.h"
 #include "core/paint/FilterEffectBuilder.h"
 #include "core/paint/LayoutObjectDrawingRecorder.h"
 #include "core/svg/graphics/filters/SVGFilterBuilder.h"
@@ skipping 34 matching lines @@
 
     // Content is cached by the source graphic so temporaries can be freed.
     m_paintController = nullptr;
     m_context = nullptr;
 
     filterData->m_state = FilterData::ReadyToPaint;
 }
 
 static void paintFilteredContent(GraphicsContext& context, const LayoutObject& object, FilterData* filterData)
 {
-    DCHECK_EQ(filterData->m_state, FilterData::ReadyToPaint);
+    if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(context, object, DisplayItem::kSVGFilter))
+        return;
+
+    FloatRect filterBounds = filterData ? filterData->lastEffect->getFilter()->filterRegion() : FloatRect();
+    LayoutObjectDrawingRecorder recorder(context, object, DisplayItem::kSVGFilter, filterBounds);
+    if (!filterData || filterData->m_state != FilterData::ReadyToPaint)
+        return;
     DCHECK(filterData->lastEffect->getFilter()->getSourceGraphic());
 
     filterData->m_state = FilterData::PaintingFilter;
 
     FilterEffect* lastEffect = filterData->lastEffect;
     sk_sp<SkImageFilter> imageFilter = SkiaImageFilterBuilder::build(lastEffect, ColorSpaceDeviceRGB);
     context.save();
 
     // Clip drawing of filtered image to the minimum required paint rect.
     context.clipRect(lastEffect->mapRect(object.strokeBoundingBox()));
 
-    FloatRect boundaries = lastEffect->getFilter()->filterRegion();
-    context.beginLayer(1, SkXfermode::kSrcOver_Mode, &boundaries, ColorFilterNone, std::move(imageFilter));
+    context.beginLayer(1, SkXfermode::kSrcOver_Mode, &filterBounds, ColorFilterNone, std::move(imageFilter));
     context.endLayer();
     context.restore();
 
     filterData->m_state = FilterData::ReadyToPaint;
 }
 
 GraphicsContext* SVGFilterPainter::prepareEffect(const LayoutObject& object, SVGFilterRecordingContext& recordingContext)
 {
     m_filter.clearInvalidationMask();
 
@@ skipping 39 matching lines @@
             filterData->m_state = FilterData::PaintingFilter;
 
         // Check for RecordingContent here because we may can be re-painting
         // without re-recording the contents to be filtered.
         if (filterData->m_state == FilterData::RecordingContent)
             recordingContext.endContent(filterData);
 
         if (filterData->m_state == FilterData::RecordingContentCycleDetected)
             filterData->m_state = FilterData::RecordingContent;
     }
-
-    GraphicsContext& context = recordingContext.paintingContext();
-    if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(context, object, DisplayItem::kSVGFilter))
-        return;
-
-    FloatRect filterRegion = filterData ? filterData->lastEffect->getFilter()->filterRegion() : FloatRect();
-    LayoutObjectDrawingRecorder recorder(context, object, DisplayItem::kSVGFilter, filterRegion);
-    if (filterData && filterData->m_state == FilterData::ReadyToPaint)
-        paintFilteredContent(context, object, filterData);
+    paintFilteredContent(recordingContext.paintingContext(), object, filterData);
 }
 
 } // namespace blink