Clean up font loading

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

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller <mueller@kde.org>
     Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
     Copyright (C) 2004, 2005, 2006, 2007 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 39 matching lines @@
     using ClientType = ResourceClient;
 
     static ImageResource* fetch(FetchRequest&, ResourceFetcher*);
 
     static ImageResource* create(blink::Image* image)
     {
         return new ImageResource(image, ResourceLoaderOptions());
     }
 
     // Exposed for testing
-    static ImageResource* create(const ResourceRequest& request, blink::Image* image)
+    static ImageResource* create(const ResourceRequest& request)
     {
-        return new ImageResource(request, image, ResourceLoaderOptions());
+        return new ImageResource(request, ResourceLoaderOptions());
     }
 
     ~ImageResource() override;
 
     blink::Image* getImage(); // Returns the nullImage() if the image is not available yet.
     bool hasImage() const { return m_image.get(); }
 
     static std::pair<blink::Image*, float> brokenImage(float deviceScaleFactor); // Returns an image and the image's resolution scale factor.
     bool willPaintBrokenImage() const;
 
@@ skipping 50 matching lines @@
 
     DECLARE_VIRTUAL_TRACE();
 
 protected:
     bool isSafeToUnlock() const override;
     void destroyDecodedDataIfPossible() override;
     void destroyDecodedDataForFailedRevalidation() override;
 
 private:
     explicit ImageResource(blink::Image*, const ResourceLoaderOptions&);
     ImageResource(const ResourceRequest&, blink::Image*, const ResourceLoaderOptions&);

[hiroshige, 2016/04/08 01:02:04]

We can remove this decralation.

[Nate Chapin, 2016/04/11 18:47:32]

Done.

 
     enum class MultipartParsingState : uint8_t {
         WaitingForFirstPart,
         ParsingFirstPart,
         FinishedParsingFirstPart,
     };
 
     class ImageResourceFactory : public ResourceFactory {
     public:
         ImageResourceFactory()
@@ skipping 23 matching lines @@
     bool m_hasDevicePixelRatioHeaderValue;
     HashCountedSet<ImageResourceObserver*> m_observers;
     HashCountedSet<ImageResourceObserver*> m_finishedObservers;
 };
 
 DEFINE_RESOURCE_TYPE_CASTS(Image);
 
 } // namespace blink
 
 #endif