Reland of "Tracking reference filter mutation via SVGElementProxy"

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
  * All rights reserved.
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 12 matching lines @@
 
 #include "core/css/resolver/ElementStyleResources.h"
 
 #include "core/CSSPropertyNames.h"
 #include "core/css/CSSCursorImageValue.h"
 #include "core/css/CSSGradientValue.h"
 #include "core/css/CSSImageValue.h"
 #include "core/css/CSSURIValue.h"
 #include "core/dom/Document.h"
 #include "core/fetch/ResourceFetcher.h"
-#include "core/layout/svg/ReferenceFilterBuilder.h"
 #include "core/style/ComputedStyle.h"
 #include "core/style/ContentData.h"
 #include "core/style/CursorData.h"
 #include "core/style/FillLayer.h"
 #include "core/style/FilterOperation.h"
 #include "core/style/StyleFetchedImage.h"
 #include "core/style/StyleFetchedImageSet.h"
 #include "core/style/StyleGeneratedImage.h"
 #include "core/style/StyleImage.h"
 #include "core/style/StyleInvalidImage.h"
 #include "core/style/StylePendingImage.h"
+#include "core/svg/SVGElementProxy.h"
 
 namespace blink {
 
 ElementStyleResources::ElementStyleResources(Document& document,
                                              float deviceScaleFactor)
     : m_document(&document), m_deviceScaleFactor(deviceScaleFactor) {}
 
 StyleImage* ElementStyleResources::styleImage(CSSPropertyID property,
                                               const CSSValue& value) {
   if (value.isImageValue())
@@ skipping 46 matching lines @@
 StyleImage* ElementStyleResources::cursorOrPendingFromValue(
     CSSPropertyID property,
     const CSSCursorImageValue& value) {
   if (value.isCachePending(m_deviceScaleFactor)) {
     m_pendingImageProperties.add(property);
     return StylePendingImage::create(value);
   }
   return value.cachedImage(m_deviceScaleFactor);
 }
 
-void ElementStyleResources::addPendingSVGDocument(
-    FilterOperation* filterOperation,
-    const CSSURIValue* cssUriValue) {
-  m_pendingSVGDocuments.set(filterOperation, cssUriValue);
+SVGElementProxy& ElementStyleResources::cachedOrPendingFromValue(
+    const CSSURIValue& value) {
+  return value.ensureElementProxy(*m_document);
 }
 
 void ElementStyleResources::loadPendingSVGDocuments(
     ComputedStyle* computedStyle) {
-  if (!computedStyle->hasFilter() || m_pendingSVGDocuments.isEmpty())
+  if (!computedStyle->hasFilter())
     return;
-
   FilterOperations::FilterOperationVector& filterOperations =
       computedStyle->mutableFilter().operations();
-  for (unsigned i = 0; i < filterOperations.size(); ++i) {
-    FilterOperation* filterOperation = filterOperations.at(i);
-    if (filterOperation->type() == FilterOperation::REFERENCE) {
-      ReferenceFilterOperation* referenceFilter =
-          toReferenceFilterOperation(filterOperation);
-
-      const CSSURIValue* value = m_pendingSVGDocuments.get(referenceFilter);
-      if (!value)
-        continue;
-      DocumentResource* resource = value->load(*m_document);
-      if (!resource)
-        continue;
-
-      // Stash the DocumentResource on the reference filter.
-      ReferenceFilterBuilder::setDocumentResourceReference(
-          referenceFilter, new DocumentResourceReference(resource));
-    }
+  for (auto& filterOperation : filterOperations) {
+    if (filterOperation->type() != FilterOperation::REFERENCE)
+      continue;
+    ReferenceFilterOperation& referenceOperation =
+        toReferenceFilterOperation(*filterOperation);
+    referenceOperation.elementProxy().resolve(*m_document);
   }
 }
 
 StyleImage* ElementStyleResources::loadPendingImage(
     ComputedStyle* style,
     StylePendingImage* pendingImage,
     CrossOriginAttributeValue crossOrigin) {
   if (CSSImageValue* imageValue = pendingImage->cssImageValue())
     return imageValue->cacheImage(*m_document, crossOrigin);
 
@@ skipping 135 matching lines @@
     }
   }
 }
 
 void ElementStyleResources::loadPendingResources(ComputedStyle* computedStyle) {
   loadPendingImages(computedStyle);
   loadPendingSVGDocuments(computedStyle);
 }
 
 }  // namespace blink