HTMLPreloadScanner unit tests

Source/core/html/parser/HTMLResourcePreloader.cpp

 /*
  * 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 11 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/html/parser/HTMLResourcePreloader.h"
 
 #include "core/dom/Document.h"
 #include "core/fetch/FetchInitiatorInfo.h"
 #include "core/fetch/ResourceFetcher.h"
-#include "core/html/imports/HTMLImport.h"
-#include "core/layout/LayoutObject.h"
 #include "public/platform/Platform.h"
 
 namespace blink {
 
-bool PreloadRequest::isSafeToSendToAnotherThread() const
-{
-    return m_initiatorName.isSafeToSendToAnotherThread()
-        && m_charset.isSafeToSendToAnotherThread()
-        && m_resourceURL.isSafeToSendToAnotherThread()
-        && m_baseURL.isSafeToSendToAnotherThread();
-}
-
-KURL PreloadRequest::completeURL(Document* document)
-{
-    return document->completeURLWithOverride(m_resourceURL, m_baseURL.isEmpty() ? document->url() : m_baseURL);
-}
-
-FetchRequest PreloadRequest::resourceRequest(Document* document)
-{
-    ASSERT(isMainThread());
-    FetchInitiatorInfo initiatorInfo;
-    initiatorInfo.name = AtomicString(m_initiatorName);
-    initiatorInfo.position = m_initiatorPosition;
-    FetchRequest request(ResourceRequest(completeURL(document)), initiatorInfo);
-
-    if (m_isCORSEnabled)
-        request.setCrossOriginAccessControl(document->securityOrigin(), m_allowCredentials);
-
-    request.setDefer(m_defer);
-    request.setResourceWidth(m_resourceWidth);
-
-    return request;
-}
-
 inline HTMLResourcePreloader::HTMLResourcePreloader(Document& document)
     : m_document(document)
 {
 }
 
 PassOwnPtrWillBeRawPtr<HTMLResourcePreloader> HTMLResourcePreloader::create(Document& document)
 {
     return adoptPtrWillBeNoop(new HTMLResourcePreloader(document));
 }
 
 DEFINE_TRACE(HTMLResourcePreloader)
 {
     visitor->trace(m_document);
 }
 
 void HTMLResourcePreloader::takeAndPreload(PreloadRequestStream& r)

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

Remove this. This implementation seems idential to
ResourcePreloader::takeAndPreload.

 {
     PreloadRequestStream requests;
     requests.swap(r);
 
     for (PreloadRequestStream::iterator it = requests.begin(); it != requests.end(); ++it)
         preload(it->release());
 }
 
 void HTMLResourcePreloader::preload(PassOwnPtr<PreloadRequest> preload)
 {
     FetchRequest request = preload->resourceRequest(m_document);
     blink::Platform::current()->histogramCustomCounts("WebCore.PreloadDelayMs", static_cast<int>(1000 * (monotonicallyIncreasingTime() - preload->discoveryTime())), 0, 2000, 20);
     m_document->fetcher()->preload(preload->resourceType(), request, preload->charset());
 }
 
 }