[ImageResource 1b] Change SVGFEImageElement from ResourceClient to ImageResourceObserver

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

Index: third_party/WebKit/Source/core/svg/SVGFEImageElement.cpp
diff --git a/third_party/WebKit/Source/core/svg/SVGFEImageElement.cpp b/third_party/WebKit/Source/core/svg/SVGFEImageElement.cpp
index bbcaadc9743d55b2a0c65ad4eb82d6179906f59d..d17687ee1f482cc68151f0e457c02e5b84e66632 100644
--- a/third_party/WebKit/Source/core/svg/SVGFEImageElement.cpp
+++ b/third_party/WebKit/Source/core/svg/SVGFEImageElement.cpp
@@ -44,7 +44,7 @@ DEFINE_NODE_FACTORY(SVGFEImageElement)
 
 SVGFEImageElement::~SVGFEImageElement() {
   if (m_cachedImage) {
-    m_cachedImage->removeClient(this);
+    m_cachedImage->removeObserver(this);
     m_cachedImage = nullptr;
   }
 }
@@ -54,7 +54,6 @@ DEFINE_TRACE(SVGFEImageElement) {
   visitor->trace(m_cachedImage);
   SVGFilterPrimitiveStandardAttributes::trace(visitor);
   SVGURIReference::trace(visitor);
-  ResourceClient::trace(visitor);
 }
 
 bool SVGFEImageElement::currentFrameHasSingleSecurityOrigin() const {
@@ -66,7 +65,7 @@ bool SVGFEImageElement::currentFrameHasSingleSecurityOrigin() const {
 
 void SVGFEImageElement::clearResourceReferences() {
   if (m_cachedImage) {
-    m_cachedImage->removeClient(this);
+    m_cachedImage->removeObserver(this);
     m_cachedImage = nullptr;
   }
 
@@ -79,7 +78,7 @@ void SVGFEImageElement::fetchImageResource() {
   m_cachedImage = ImageResource::fetch(request, document().fetcher());
 
   if (m_cachedImage)
-    m_cachedImage->addClient(this);
+    m_cachedImage->addObserver(this);
 }
 
 void SVGFEImageElement::buildPendingResource() {
@@ -136,7 +135,7 @@ void SVGFEImageElement::removedFrom(ContainerNode* rootParent) {
     clearResourceReferences();
 }
 
-void SVGFEImageElement::notifyFinished(Resource*) {
+void SVGFEImageElement::imageNotifyFinished(ImageResource*) {
   if (!isConnected())
     return;