[ImageResource 1a] Change StyleFetchedImage from ResourceClient to ImageResourceObserver

third_party/WebKit/Source/core/style/StyleFetchedImage.cpp

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple 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 18 matching lines @@
 #include "core/svg/graphics/SVGImage.h"
 #include "core/svg/graphics/SVGImageForContainer.h"
 
 namespace blink {
 
 StyleFetchedImage::StyleFetchedImage(ImageResource* image,
                                      const Document& document,
                                      const KURL& url)
     : m_image(image), m_document(&document), m_url(url) {
   m_isImageResource = true;
-  m_image->addClient(this);
+  m_image->addObserver(this);
   // ResourceFetcher is not determined from StyleFetchedImage and it is
   // impossible to send a request for refetching.
   m_image->setNotRefetchableDataFromDiskCache();
   ThreadState::current()->registerPreFinalizer(this);
 }
 
 StyleFetchedImage::~StyleFetchedImage() {}
 
 void StyleFetchedImage::dispose() {
-  m_image->removeClient(this);
+  m_image->removeObserver(this);
   m_image = nullptr;
 }
 
 WrappedImagePtr StyleFetchedImage::data() const {
   return m_image.get();
 }
 
 ImageResource* StyleFetchedImage::cachedImage() const {
   return m_image.get();
 }
@@ skipping 43 matching lines @@
 }
 
 void StyleFetchedImage::addClient(LayoutObject* layoutObject) {
   m_image->addObserver(layoutObject);
 }
 
 void StyleFetchedImage::removeClient(LayoutObject* layoutObject) {
   m_image->removeObserver(layoutObject);
 }
 
-void StyleFetchedImage::notifyFinished(Resource* resource) {
+void StyleFetchedImage::imageNotifyFinished(ImageResource*) {
   if (m_document && m_image && m_image->getImage() &&
       m_image->getImage()->isSVGImage())
     toSVGImage(m_image->getImage())->updateUseCounters(*m_document);
   // Oilpan: do not prolong the Document's lifetime.
   m_document.clear();
 }
 
 PassRefPtr<Image> StyleFetchedImage::image(const LayoutObject&,
                                            const IntSize& containerSize,
                                            float zoom) const {
@@ skipping 10 matching lines @@
                "data",
                InspectorPaintImageEvent::data(&layoutObject, *m_image.get()));
   return m_image->getImage()->currentFrameKnownToBeOpaque(
       Image::PreCacheMetadata);
 }
 
 DEFINE_TRACE(StyleFetchedImage) {
   visitor->trace(m_image);
   visitor->trace(m_document);
   StyleImage::trace(visitor);
-  ResourceClient::trace(visitor);
 }
 
 }  // namespace blink