Reland of "Tracking reference filter mutation via SVGElementProxy"

third_party/WebKit/Source/core/css/resolver/FilterOperationResolver.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.
  * All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
@@ skipping 18 matching lines @@
  */
 
 #include "core/css/resolver/FilterOperationResolver.h"
 
 #include "core/css/CSSFunctionValue.h"
 #include "core/css/CSSPrimitiveValueMappings.h"
 #include "core/css/CSSShadowValue.h"
 #include "core/css/CSSURIValue.h"
 #include "core/css/resolver/StyleResolverState.h"
 #include "core/frame/UseCounter.h"
-#include "core/layout/svg/ReferenceFilterBuilder.h"
-#include "core/svg/SVGURIReference.h"
 
 namespace blink {
 
 FilterOperation::OperationType FilterOperationResolver::filterOperationForType(
     CSSValueID type) {
   switch (type) {
     case CSSValueGrayscale:
       return FilterOperation::GRAYSCALE;
     case CSSValueSepia:
       return FilterOperation::SEPIA;
@@ skipping 77 matching lines @@
     return operations;
   }
 
   const CSSToLengthConversionData& conversionData =
       state.cssToLengthConversionData();
   for (auto& currValue : toCSSValueList(inValue)) {
     if (currValue->isURIValue()) {
       countFilterUse(FilterOperation::REFERENCE, state.document());
 
       const CSSURIValue& urlValue = toCSSURIValue(*currValue);
-      SVGURLReferenceResolver resolver(urlValue.value(), state.document());
-      ReferenceFilterOperation* operation = ReferenceFilterOperation::create(
-          urlValue.value(), resolver.fragmentIdentifier());
-      if (!resolver.isLocal()) {
-        if (!urlValue.loadRequested())
-          state.elementStyleResources().addPendingSVGDocument(operation,
-                                                              &urlValue);
-        else if (urlValue.cachedDocument())
-          ReferenceFilterBuilder::setDocumentResourceReference(
-              operation,
-              new DocumentResourceReference(urlValue.cachedDocument()));
-      }
-      operations.operations().append(operation);
+      SVGElementProxy& elementProxy =
+          state.elementStyleResources().cachedOrPendingFromValue(urlValue);
+      operations.operations().append(
+          ReferenceFilterOperation::create(urlValue.value(), elementProxy));
       continue;
     }
 
     const CSSFunctionValue* filterValue = toCSSFunctionValue(currValue.get());
     FilterOperation::OperationType operationType =
         filterOperationForType(filterValue->functionType());
     countFilterUse(operationType, state.document());
     DCHECK_LE(filterValue->length(), 1u);
 
     const CSSPrimitiveValue* firstValue =
@@ skipping 67 matching lines @@
       default:
         ASSERT_NOT_REACHED();
         break;
     }
   }
 
   return operations;
 }
 
 }  // namespace blink