Split ImageResourceClient into ResourceClient and ImageResourceObserver [1/2]

third_party/WebKit/Source/core/fetch/MockResourceClients.h

 /*
  * Copyright (c) 2013, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 10 matching lines @@
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef MockImageResourceClient_h
-#define MockImageResourceClient_h
+#ifndef MockResourceClients_h
+#define MockResourceClients_h
 
-#include "core/fetch/ImageResourceClient.h"
+#include "core/fetch/ImageResourceObserver.h"
 #include "core/fetch/Resource.h"
+#include "core/fetch/ResourceClient.h"
 #include "platform/heap/Handle.h"
 
 namespace blink {
 
-class MockImageResourceClient final : public ImageResourceClient {
+class MockResourceClient : public ResourceClient {
 public:
-    explicit MockImageResourceClient(const PassRefPtrWillBeRawPtr<Resource>);
+    explicit MockResourceClient(const PassRefPtrWillBeRawPtr<Resource>);
+    ~MockResourceClient() override;
+
+    void notifyFinished(Resource*) override;
+    String debugName() const override { return "MockResourceClient"; }
+    bool notifyFinishedCalled() const { return m_notifyFinishedCalled; }
+
+    virtual void removeAsClient();
+
+protected:
+    // TODO(Oilpan): properly trace when ResourceClient is on the heap.
+    RawPtrWillBeUntracedMember<Resource> m_resource;
+    bool m_notifyFinishedCalled;
+};
+
+class MockImageResourceClient final : public MockResourceClient, public ImageResourceObserver {
+public:
+    explicit MockImageResourceClient(const PassRefPtrWillBeRawPtr<ImageResource>);
     ~MockImageResourceClient() override;
 
-    void imageChanged(ImageResource*, const IntRect*) override
-    {
-        m_imageChangedCount++;
-    }
+    void imageChanged(ImageResource*, const IntRect*) override;
 
-    void notifyFinished(Resource*) override;
     String debugName() const override { return "MockImageResourceClient"; }
 
+    void removeAsClient() override;
+
     int imageChangedCount() const { return m_imageChangedCount; }
-    bool notifyFinishedCalled() const { return m_notifyFinishedCalled; }
-
-    void removeAsClient();
 
 private:
-    // TODO(Oilpan): properly trace when ImageResourceClient is on the heap.
-    RawPtrWillBeUntracedMember<Resource> m_resource;
     int m_imageChangedCount;
-    bool m_notifyFinishedCalled;
 };
 
 } // namespace blink
 
-#endif // MockImageResourceClient_h
+#endif // MockResourceClients_h