Turn FilterEffectBuilder into a stack-allocated helper

third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DState.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 "modules/canvas2d/CanvasRenderingContext2DState.h"
 
 #include "core/css/CSSFontSelector.h"
 #include "core/css/resolver/FilterOperationResolver.h"
 #include "core/css/resolver/StyleBuilder.h"
 #include "core/css/resolver/StyleResolverState.h"
 #include "core/html/HTMLCanvasElement.h"
 #include "core/paint/FilterEffectBuilder.h"
 #include "core/style/ComputedStyle.h"
 #include "core/svg/SVGFilterElement.h"
 #include "modules/canvas2d/CanvasGradient.h"
 #include "modules/canvas2d/CanvasPattern.h"
 #include "modules/canvas2d/CanvasRenderingContext2D.h"
 #include "modules/canvas2d/CanvasStyle.h"
 #include "platform/graphics/DrawLooperBuilder.h"
+#include "platform/graphics/filters/FilterEffect.h"
 #include "platform/graphics/filters/FilterOperation.h"
 #include "platform/graphics/filters/SkiaImageFilterBuilder.h"
 #include "platform/graphics/skia/SkiaUtils.h"
 #include "third_party/skia/include/effects/SkDashPathEffect.h"
 #include "third_party/skia/include/effects/SkDropShadowImageFilter.h"
 #include <memory>
 
 static const char defaultFont[] = "10px sans-serif";
 static const char defaultFilter[] = "none";
 
@@ skipping 271 matching lines @@
     if (!m_resolvedFilter) {
         RefPtr<ComputedStyle> filterStyle = ComputedStyle::create();
         // Must set font in case the filter uses any font-relative units (em, ex)
         filterStyle->setFont(m_fontForFilter);
 
         StyleResolverState resolverState(styleResolutionHost->document(), styleResolutionHost, filterStyle.get());
         resolverState.setStyle(filterStyle);
 
         StyleBuilder::applyProperty(CSSPropertyFilter, resolverState, *m_filterValue);
         resolverState.loadPendingResources();
-        FilterEffectBuilder* filterEffectBuilder = FilterEffectBuilder::create();
 
         // We can't reuse m_fillPaint and m_strokePaint for the filter, since these incorporate
         // the global alpha, which isn't applicable here.
         SkPaint fillPaintForFilter;
+        m_fillStyle->applyToPaint(fillPaintForFilter);
+        fillPaintForFilter.setColor(m_fillStyle->paintColor());
         SkPaint strokePaintForFilter;
-        m_fillStyle->applyToPaint(fillPaintForFilter);
         m_strokeStyle->applyToPaint(strokePaintForFilter);
-        fillPaintForFilter.setColor(m_fillStyle->paintColor());
         strokePaintForFilter.setColor(m_strokeStyle->paintColor());
-        FloatRect referenceBox((FloatPoint()), FloatSize(canvasSize));
-        const double effectiveZoom = 1.0; // Deliberately ignore zoom on the canvas element
-        filterEffectBuilder->build(styleResolutionHost, filterStyle->filter(), effectiveZoom, referenceBox, &fillPaintForFilter, &strokePaintForFilter);
 
-        if (FilterEffect* lastEffect = filterEffectBuilder->lastEffect()) {
+        FilterEffectBuilder filterEffectBuilder(
+            styleResolutionHost,
+            FloatRect((FloatPoint()), FloatSize(canvasSize)),
+            1.0f, // Deliberately ignore zoom on the canvas element.
+            &fillPaintForFilter, &strokePaintForFilter);
+
+        if (FilterEffect* lastEffect = filterEffectBuilder.buildFilterEffect(filterStyle->filter())) {
             m_resolvedFilter = SkiaImageFilterBuilder::build(lastEffect, ColorSpaceDeviceRGB);
             if (m_resolvedFilter) {
                 updateFilterReferences(toHTMLCanvasElement(styleResolutionHost), context, filterStyle->filter());
                 if (lastEffect->originTainted())
                     context->setOriginTainted();
             }
         }
     }
 
     return m_resolvedFilter.get();
@@ skipping 224 matching lines @@
         paint->setLooper(0);
         paint->setImageFilter(shadowAndForegroundImageFilter());
         return paint;
     }
     paint->setLooper(sk_ref_sp(shadowAndForegroundDrawLooper()));
     paint->setImageFilter(0);
     return paint;
 }
 
 } // namespace blink