Split ImageResourceClient into ResourceClient and ImageResourceObserver [1/2]

third_party/WebKit/Source/core/loader/ImageLoader.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2009 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.
  *
  * 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.
  *
  */
 
 #ifndef ImageLoader_h
 #define ImageLoader_h
 
 #include "core/CoreExport.h"
 #include "core/fetch/ImageResource.h"
-#include "core/fetch/ImageResourceClient.h"
+#include "core/fetch/ImageResourceObserver.h"
+#include "core/fetch/ResourceClient.h"
 #include "platform/heap/Handle.h"
 #include "wtf/HashSet.h"
 #include "wtf/WeakPtr.h"
 #include "wtf/text/AtomicString.h"
 
 namespace blink {
 
 class IncrementLoadEventDelayCount;
 class FetchRequest;
 class Document;
@@ skipping 11 matching lines @@
     ImageLoaderClient() { }
 };
 
 class Element;
 class ImageLoader;
 class LayoutImageResource;
 
 template<typename T> class EventSender;
 using ImageEventSender = EventSender<ImageLoader>;
 
-class CORE_EXPORT ImageLoader : public NoBaseWillBeGarbageCollectedFinalized<ImageLoader>, public ImageResourceClient {
+class CORE_EXPORT ImageLoader : public NoBaseWillBeGarbageCollectedFinalized<ImageLoader>, public ResourceClient, public ImageResourceObserver {
     WILL_BE_USING_PRE_FINALIZER(ImageLoader, dispose);
     USING_FAST_MALLOC_WILL_BE_REMOVED(ImageLoader);
 public:
     explicit ImageLoader(Element*);
     ~ImageLoader() override;
 
     DECLARE_TRACE();
 
     enum UpdateFromElementBehavior {
         // This should be the update behavior when the element is attached to a document, or when DOM mutations trigger a new load.
@@ skipping 37 matching lines @@
     bool hasPendingError() const
     {
         return m_hasPendingErrorEvent;
     }
 
     void dispatchPendingEvent(ImageEventSender*);
 
     static void dispatchPendingLoadEvents();
     static void dispatchPendingErrorEvents();
 
-    bool getImageAnimationPolicy(ImageResource*, ImageAnimationPolicy&) final;
+    bool getImageAnimationPolicy(ImageAnimationPolicy&) final;
 protected:
     void notifyFinished(Resource*) override;
 
 private:
     class Task;
 
     // Called from the task or from updateFromElement to initiate the load.
     void doUpdateFromElement(BypassMainWorldBehavior, UpdateFromElementBehavior, ReferrerPolicy = ReferrerPolicyDefault);
 
     virtual void dispatchLoadEvent() = 0;
@@ skipping 53 matching lines @@
     bool m_imageComplete : 1;
     bool m_loadingImageDocument : 1;
     bool m_elementIsProtected : 1;
     bool m_suppressErrorEvents : 1;
     unsigned m_highPriorityClientCount;
 };
 
 } // namespace blink
 
 #endif