HTMLPreloadScanner unit tests

Source/core/html/parser/HTMLResourcePreloader.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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 10 matching lines @@
  * 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 HTMLResourcePreloader_h
 #define HTMLResourcePreloader_h
 
 #include "core/fetch/FetchRequest.h"
 #include "core/fetch/Resource.h"
+#include "core/html/parser/PreloadRequest.h"
+#include "core/html/parser/ResourcePreloader.h"
 #include "wtf/CurrentTime.h"
 #include "wtf/text/TextPosition.h"
 
 namespace blink {
 
-class Document;
-
-class PreloadRequest {
-public:
-    static PassOwnPtr<PreloadRequest> create(const String& initiatorName, const TextPosition& initiatorPosition, const String& resourceURL, const KURL& baseURL, Resource::Type resourceType, const FetchRequest::ResourceWidth& resourceWidth = FetchRequest::ResourceWidth())
-    {
-        return adoptPtr(new PreloadRequest(initiatorName, initiatorPosition, resourceURL, baseURL, resourceType, resourceWidth));
-    }
-
-    bool isSafeToSendToAnotherThread() const;
-
-    FetchRequest resourceRequest(Document*);
-
-    const String& charset() const { return m_charset; }
-    double discoveryTime() const { return m_discoveryTime; }
-    void setDefer(FetchRequest::DeferOption defer) { m_defer = defer; }
-    void setCharset(const String& charset) { m_charset = charset.isolatedCopy(); }
-    void setCrossOriginEnabled(StoredCredentials allowCredentials)
-    {
-        m_isCORSEnabled = true;
-        m_allowCredentials = allowCredentials;
-    }
-
-    Resource::Type resourceType() const { return m_resourceType; }
-
-private:
-    PreloadRequest(const String& initiatorName, const TextPosition& initiatorPosition, const String& resourceURL, const KURL& baseURL, Resource::Type resourceType, const FetchRequest::ResourceWidth& resourceWidth)
-        : m_initiatorName(initiatorName)
-        , m_initiatorPosition(initiatorPosition)
-        , m_resourceURL(resourceURL.isolatedCopy())
-        , m_baseURL(baseURL.copy())
-        , m_resourceType(resourceType)
-        , m_isCORSEnabled(false)
-        , m_allowCredentials(DoNotAllowStoredCredentials)
-        , m_discoveryTime(monotonicallyIncreasingTime())
-        , m_defer(FetchRequest::NoDefer)
-        , m_resourceWidth(resourceWidth)
-    {
-    }
-
-    KURL completeURL(Document*);
-
-    String m_initiatorName;
-    TextPosition m_initiatorPosition;
-    String m_resourceURL;
-    KURL m_baseURL;
-    String m_charset;
-    Resource::Type m_resourceType;
-    bool m_isCORSEnabled;
-    StoredCredentials m_allowCredentials;
-    double m_discoveryTime;
-    FetchRequest::DeferOption m_defer;
-    FetchRequest::ResourceWidth m_resourceWidth;
-};
-
-typedef Vector<OwnPtr<PreloadRequest>> PreloadRequestStream;
-
-class HTMLResourcePreloader final : public NoBaseWillBeGarbageCollected<HTMLResourcePreloader> {
+class HTMLResourcePreloader final : public NoBaseWillBeGarbageCollected<HTMLResourcePreloader>, public ResourcePreloader {
     WTF_MAKE_NONCOPYABLE(HTMLResourcePreloader); WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(HTMLResourcePreloader);
 public:
     static PassOwnPtrWillBeRawPtr<HTMLResourcePreloader> create(Document&);
     DECLARE_TRACE();
 
-    void takeAndPreload(PreloadRequestStream&);
+    virtual void takeAndPreload(PreloadRequestStream&);

[kouhei (in TOK), 2015/04/30 12:59:21]

remove this?

+
+protected:
+    virtual void preload(PassOwnPtr<PreloadRequest>);

[kouhei (in TOK), 2015/04/30 12:59:21]

override

 
 private:
     explicit HTMLResourcePreloader(Document&);
 
-    void preload(PassOwnPtr<PreloadRequest>);
-
     RawPtrWillBeMember<Document> m_document;
 };
 
 }
 
 #endif