Use IdTargetObserver in SVGFEImageElement

third_party/WebKit/Source/core/svg/SVGFEImageElement.cpp

 /*
  * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org>
  * Copyright (C) 2010 Dirk Schulze <krit@webkit.org>
  *
  * 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.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "core/svg/SVGFEImageElement.h"
 
+#include "core/SVGNames.h"
 #include "core/dom/Document.h"
+#include "core/dom/IdTargetObserver.h"
+#include "core/loader/resource/ImageResourceContent.h"
 #include "core/svg/SVGPreserveAspectRatio.h"
-#include "core/svg/SVGTreeScopeResources.h"
 #include "core/svg/graphics/filters/SVGFEImage.h"
 #include "platform/graphics/Image.h"
 #include "platform/loader/fetch/FetchRequest.h"
 #include "platform/loader/fetch/ResourceFetcher.h"
 
 namespace blink {
 
 inline SVGFEImageElement::SVGFEImageElement(Document& document)
     : SVGFilterPrimitiveStandardAttributes(SVGNames::feImageTag, document),
       SVGURIReference(this),
       m_preserveAspectRatio(SVGAnimatedPreserveAspectRatio::create(
           this,
           SVGNames::preserveAspectRatioAttr)) {
   addToPropertyMap(m_preserveAspectRatio);
 }
 
 DEFINE_NODE_FACTORY(SVGFEImageElement)
 
 SVGFEImageElement::~SVGFEImageElement() {
-  if (m_cachedImage) {
-    m_cachedImage->removeObserver(this);
-    m_cachedImage = nullptr;
-  }
+  clearImageResource();
 }
 
 DEFINE_TRACE(SVGFEImageElement) {
   visitor->trace(m_preserveAspectRatio);
   visitor->trace(m_cachedImage);
+  visitor->trace(m_targetIdObserver);
   SVGFilterPrimitiveStandardAttributes::trace(visitor);
   SVGURIReference::trace(visitor);
 }
 
 bool SVGFEImageElement::currentFrameHasSingleSecurityOrigin() const {
   if (m_cachedImage && m_cachedImage->getImage())
     return m_cachedImage->getImage()->currentFrameHasSingleSecurityOrigin();
 
   return true;
 }
 
 void SVGFEImageElement::clearResourceReferences() {
-  if (m_cachedImage) {
-    m_cachedImage->removeObserver(this);
-    m_cachedImage = nullptr;
-  }
-
+  clearImageResource();
+  unobserveTarget(m_targetIdObserver);
   removeAllOutgoingReferences();
 }
 
 void SVGFEImageElement::fetchImageResource() {
-  FetchRequest request(
-      ResourceRequest(ownerDocument()->completeURL(hrefString())), localName());
+  FetchRequest request(ResourceRequest(document().completeURL(hrefString())),
+                       localName());
   m_cachedImage = ImageResourceContent::fetch(request, document().fetcher());
 
   if (m_cachedImage)
     m_cachedImage->addObserver(this);
 }
 
+void SVGFEImageElement::clearImageResource() {
+  if (!m_cachedImage)
+    return;
+  m_cachedImage->removeObserver(this);
+  m_cachedImage = nullptr;
+}
+
 void SVGFEImageElement::buildPendingResource() {
   clearResourceReferences();
   if (!isConnected())
     return;
 
-  AtomicString id;
-  Element* target = SVGURIReference::targetElementFromIRIString(
-      hrefString(), treeScope(), &id);
+  Element* target = observeTarget(m_targetIdObserver, *this);
   if (!target) {
-    if (id.isEmpty()) {
+    if (!SVGURLReferenceResolver(hrefString(), document()).isLocal())
       fetchImageResource();
-    } else {
-      treeScope().ensureSVGTreeScopedResources().addPendingResource(id, *this);
-      DCHECK(hasPendingResources());
-    }
   } else if (target->isSVGElement()) {
     // Register us with the target in the dependencies map. Any change of
     // hrefElement that leads to relayout/repainting now informs us, so we can
     // react to it.
     addReferenceTo(toSVGElement(target));
   }
 
   invalidate();
 }
 
@@ skipping 45 matching lines @@
         m_cachedImage->errorOccurred() ? nullptr : m_cachedImage->getImage();
     return FEImage::createWithImage(filter, image,
                                     m_preserveAspectRatio->currentValue());
   }
 
   return FEImage::createWithIRIReference(filter, treeScope(), hrefString(),
                                          m_preserveAspectRatio->currentValue());
 }
 
 }  // namespace blink