Reland of "Tracking reference filter mutation via SVGElementProxy"

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"
@@ skipping 254 matching lines @@
     const AffineTransform& transform) {
   m_isTransformInvertible = transform.isInvertible();
   m_transform = transform;
 }
 
 void CanvasRenderingContext2DState::resetTransform() {
   m_transform.makeIdentity();
   m_isTransformInvertible = true;
 }
 
-static void updateFilterReferences(HTMLCanvasElement* canvasElement,
-                                   CanvasRenderingContext2D* context,
-                                   const FilterOperations& filters) {
-  context->clearFilterReferences();
-  context->addFilterReferences(filters, canvasElement->document());
-}
-
 sk_sp<SkImageFilter> CanvasRenderingContext2DState::getFilter(
     Element* styleResolutionHost,
     IntSize canvasSize,
     CanvasRenderingContext2D* context) const {
   if (!m_filterValue)
     return nullptr;
 
   // StyleResolverState cannot be used in frame-less documents.
   if (!styleResolutionHost->document().frame())
     return nullptr;
@@ skipping 23 matching lines @@
     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());
+        context->updateFilterReferences(filterStyle->filter());
         if (lastEffect->originTainted())
           context->setOriginTainted();
       }
     }
   }
 
   return m_resolvedFilter;
 }
 
 bool CanvasRenderingContext2DState::hasFilter(
@@ skipping 220 matching lines @@
     paint->setLooper(0);
     paint->setImageFilter(shadowAndForegroundImageFilter());
     return paint;
   }
   paint->setLooper(sk_ref_sp(shadowAndForegroundDrawLooper()));
   paint->setImageFilter(0);
   return paint;
 }
 
 }  // namespace blink