[ImageResource 1a] Change StyleFetchedImage from ResourceClient to ImageResourceObserver

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

Index: third_party/WebKit/Source/core/style/StyleFetchedImage.h
diff --git a/third_party/WebKit/Source/core/style/StyleFetchedImage.h b/third_party/WebKit/Source/core/style/StyleFetchedImage.h
index 70d9cd9e2616f5793ab01eaf173e507f2b6fcada..4a55c27e197e387f373c300ca92f93e5d2cea0df 100644
--- a/third_party/WebKit/Source/core/style/StyleFetchedImage.h
+++ b/third_party/WebKit/Source/core/style/StyleFetchedImage.h
@@ -24,6 +24,7 @@
 #ifndef StyleFetchedImage_h
 #define StyleFetchedImage_h
 
+#include "core/fetch/ImageResourceObserver.h"
 #include "core/fetch/ResourceClient.h"

[yhirano, 2016/11/29 08:26:59]

Not needed?

[hiroshige, 2016/11/29 09:18:01]

Done.

 #include "core/style/StyleImage.h"
 #include "platform/weborigin/KURL.h"
@@ -33,9 +34,9 @@ namespace blink {
 class Document;
 class ImageResource;
 
-class StyleFetchedImage final : public StyleImage, private ResourceClient {
+class StyleFetchedImage final : public StyleImage,
+                                public ImageResourceObserver {
   USING_PRE_FINALIZER(StyleFetchedImage, dispose);
-  USING_GARBAGE_COLLECTED_MIXIN(StyleFetchedImage);
 
  public:
   static StyleFetchedImage* create(ImageResource* image,
@@ -60,7 +61,7 @@ class StyleFetchedImage final : public StyleImage, private ResourceClient {
   bool usesImageContainerSize() const override;
   void addClient(LayoutObject*) override;
   void removeClient(LayoutObject*) override;
-  void notifyFinished(Resource*) override;
+  void imageNotifyFinished(ImageResource*) override;
   String debugName() const override { return "StyleFetchedImage"; }
   PassRefPtr<Image> image(const LayoutObject&,
                           const IntSize&,