[ImageResource 1b] Change SVGFEImageElement from ResourceClient to ImageResourceObserver

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.
  *
@@ skipping 26 matching lines @@
       m_preserveAspectRatio(SVGAnimatedPreserveAspectRatio::create(
           this,
           SVGNames::preserveAspectRatioAttr)) {
   addToPropertyMap(m_preserveAspectRatio);
 }
 
 DEFINE_NODE_FACTORY(SVGFEImageElement)
 
 SVGFEImageElement::~SVGFEImageElement() {
   if (m_cachedImage) {
-    m_cachedImage->removeClient(this);
+    m_cachedImage->removeObserver(this);
     m_cachedImage = nullptr;
   }
 }
 
 DEFINE_TRACE(SVGFEImageElement) {
   visitor->trace(m_preserveAspectRatio);
   visitor->trace(m_cachedImage);
   SVGFilterPrimitiveStandardAttributes::trace(visitor);
   SVGURIReference::trace(visitor);
-  ResourceClient::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->removeClient(this);
+    m_cachedImage->removeObserver(this);
     m_cachedImage = nullptr;
   }
 
   removeAllOutgoingReferences();
 }
 
 void SVGFEImageElement::fetchImageResource() {
   FetchRequest request(
       ResourceRequest(ownerDocument()->completeURL(hrefString())), localName());
   m_cachedImage = ImageResource::fetch(request, document().fetcher());
 
   if (m_cachedImage)
-    m_cachedImage->addClient(this);
+    m_cachedImage->addObserver(this);
 }
 
 void SVGFEImageElement::buildPendingResource() {
   clearResourceReferences();
   if (!isConnected())
     return;
 
   AtomicString id;
   Element* target = SVGURIReference::targetElementFromIRIString(
       hrefString(), treeScope(), &id);
@@ skipping 36 matching lines @@
   buildPendingResource();
   return InsertionDone;
 }
 
 void SVGFEImageElement::removedFrom(ContainerNode* rootParent) {
   SVGFilterPrimitiveStandardAttributes::removedFrom(rootParent);
   if (rootParent->isConnected())
     clearResourceReferences();
 }
 
-void SVGFEImageElement::notifyFinished(Resource*) {
+void SVGFEImageElement::imageNotifyFinished(ImageResource*) {
   if (!isConnected())
     return;
 
   Element* parent = parentElement();
   if (!parent || !isSVGFilterElement(parent) || !parent->layoutObject())
     return;
 
   if (LayoutObject* layoutObject = this->layoutObject())
     markForLayoutAndParentResourceInvalidation(layoutObject);
 }
 
 FilterEffect* SVGFEImageElement::build(SVGFilterBuilder*, Filter* filter) {
   if (m_cachedImage) {
     // Don't use the broken image icon on image loading errors.
     RefPtr<Image> image =
         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