Split ImageResourceClient into ResourceClient and ImageResourceObserver [1/2]

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef LinkPreloadResourceClients_h
 #define LinkPreloadResourceClients_h
 
 #include "core/fetch/CSSStyleSheetResource.h"
 #include "core/fetch/FontResource.h"
 #include "core/fetch/ImageResource.h"
-#include "core/fetch/ImageResourceClient.h"
 #include "core/fetch/RawResource.h"
 #include "core/fetch/ResourceLoader.h"
 #include "core/fetch/ResourceOwner.h"
 #include "core/fetch/ScriptResource.h"
 #include "core/fetch/StyleSheetResourceClient.h"
 
 namespace blink {
 
 class LinkLoader;
 
@@ skipping 81 matching lines @@
     }
 
 private:
     LinkPreloadStyleResourceClient(LinkLoader* loader, PassRefPtrWillBeRawPtr<CSSStyleSheetResource> resource)
         : LinkPreloadResourceClient(loader)
     {
         setResource(resource);
     }
 };
 
-class LinkPreloadImageResourceClient: public LinkPreloadResourceClient, public ResourceOwner<ImageResource, ImageResourceClient> {
+class LinkPreloadImageResourceClient: public LinkPreloadResourceClient, public ResourceOwner<ImageResource> {
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(LinkPreloadImageResourceClient);
     USING_FAST_MALLOC_WILL_BE_REMOVED(LinkPreloadImageResourceClient);
 public:
     static PassOwnPtrWillBeRawPtr<LinkPreloadImageResourceClient> create(LinkLoader* loader, PassRefPtrWillBeRawPtr<ImageResource> resource)
     {
         return adoptPtrWillBeNoop(new LinkPreloadImageResourceClient(loader, resource));
     }
 
     virtual String debugName() const { return "LinkPreloadImage"; }
     virtual ~LinkPreloadImageResourceClient() { }
 
     void clear() override { clearResource(); }
 
     void notifyFinished(Resource* resource) override
     {
         ASSERT(this->resource() == toImageResource(resource));
         triggerEvents(resource);
     }
 
     DEFINE_INLINE_VIRTUAL_TRACE()
     {
         LinkPreloadResourceClient::trace(visitor);
-        ResourceOwner<ImageResource, ImageResourceClient>::trace(visitor);
+        ResourceOwner<ImageResource>::trace(visitor);
     }
 
 private:
     LinkPreloadImageResourceClient(LinkLoader* loader, PassRefPtrWillBeRawPtr<ImageResource> resource)
         : LinkPreloadResourceClient(loader)
     {
         setResource(resource);
     }
 };
 
@@ skipping 61 matching lines @@
     LinkPreloadRawResourceClient(LinkLoader* loader, PassRefPtrWillBeRawPtr<RawResource> resource)
         : LinkPreloadResourceClient(loader)
     {
         setResource(resource);
     }
 };
 
 } // namespace blink
 
 #endif // LinkPreloadResourceClients_h