Revert of Add <link rel=preload> onload support for scripts and styles

third_party/WebKit/Source/core/loader/LinkLoader.cpp

 /*
  * Copyright (C) 2011 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 72 matching lines @@
     ASSERT_UNUSED(timer, timer == &m_linkLoadTimer);
     m_client->linkLoaded();
 }
 
 void LinkLoader::linkLoadingErrorTimerFired(Timer<LinkLoader>* timer)
 {
     ASSERT_UNUSED(timer, timer == &m_linkLoadingErrorTimer);
     m_client->linkLoadingErrored();
 }
 
-void LinkLoader::triggerEvents(const Resource* resource)
-{
-    if (resource->errorOccurred())
-        m_linkLoadingErrorTimer.startOneShot(0, BLINK_FROM_HERE);
-    else
-        m_linkLoadTimer.startOneShot(0, BLINK_FROM_HERE);
-}
-
 void LinkLoader::notifyFinished(Resource* resource)
 {
     ASSERT(this->resource() == resource);
 
-    triggerEvents(resource);
+    if (resource->errorOccurred())
+        m_linkLoadingErrorTimer.startOneShot(0, BLINK_FROM_HERE);
+    else
+        m_linkLoadTimer.startOneShot(0, BLINK_FROM_HERE);
+
     clearResource();
 }
 
 void LinkLoader::didStartPrerender()
 {
     m_client->didStartLinkPrerender();
 }
 
 void LinkLoader::didStopPrerender()
 {
@@ skipping 65 matching lines @@
     if (equalIgnoringCase(as, "font"))
         return Resource::Font;
     if (equalIgnoringCase(as, "track"))
         return Resource::TextTrack;
     if (document && !as.isEmpty())
         document->addConsoleMessage(ConsoleMessage::create(OtherMessageSource, WarningMessageLevel, String("<link rel=preload> must have a valid `as` value")));
     // TODO(yoav): Is this correct? If as is missing or invalid, it should be subject to "connect-src" CSP directives.
     return Resource::LinkSubresource;
 }
 
-void LinkLoader::createLinkPreloadResourceClient(ResourcePtr<Resource> resource)
+static void preloadIfNeeded(const LinkRelAttribute& relAttribute, const KURL& href, Document& document, const String& as)
 {
-    if (!resource)
+    if (!document.loader())
         return;
-    switch (resource->type()) {
-    case Resource::Image:
-        break;
-    case Resource::Script:
-        m_linkPreloadResourceClient = LinkPreloadScriptResourceClient::create(this, toScriptResource(resource.get()));
-        break;
-    case Resource::CSSStyleSheet:
-        m_linkPreloadResourceClient = LinkPreloadStyleResourceClient::create(this, toCSSStyleSheetResource(resource.get()));
-        break;
-    // TODO(yoav): add support for everything below.
-    case Resource::Font:
-        break;
-    case Resource::Media:
-        break;
-    case Resource::TextTrack:
-        break;
-    case Resource::Raw:
-    case Resource::LinkSubresource:
-        break;
-    default:
-        ASSERT_NOT_REACHED();
+
+    if (relAttribute.isLinkPreload()) {
+        UseCounter::count(document, UseCounter::LinkRelPreload);
+        ASSERT(RuntimeEnabledFeatures::linkPreloadEnabled());
+        if (!href.isValid() || href.isEmpty()) {
+            document.addConsoleMessage(ConsoleMessage::create(OtherMessageSource, WarningMessageLevel, String("<link rel=preload> has an invalid `href` value")));
+            return;
+        }
+        Resource::Type type = LinkLoader::getTypeFromAsAttribute(as, &document);
+        ResourceRequest resourceRequest(document.completeURL(href));
+        ResourceFetcher::determineRequestContext(resourceRequest, type, false);
+        FetchRequest linkRequest(resourceRequest, FetchInitiatorTypeNames::link);
+
+        linkRequest.setPriority(document.fetcher()->loadPriority(type, linkRequest));
+        Settings* settings = document.settings();
+        if (settings && settings->logPreload())
+            document.addConsoleMessage(ConsoleMessage::create(OtherMessageSource, DebugMessageLevel, String("Preload triggered for " + href.host() + href.path())));
+        linkRequest.setForPreload(true);
+        linkRequest.setAvoidBlockingOnLoad(true);
+        document.loader()->startPreload(type, linkRequest);
     }
 }
 
-static ResourcePtr<Resource> preloadIfNeeded(const LinkRelAttribute& relAttribute, const KURL& href, Document& document, const String& as)
-{
-    if (!document.loader() || !relAttribute.isLinkPreload())
-        return nullptr;
-
-    UseCounter::count(document, UseCounter::LinkRelPreload);
-    ASSERT(RuntimeEnabledFeatures::linkPreloadEnabled());
-    if (!href.isValid() || href.isEmpty()) {
-        document.addConsoleMessage(ConsoleMessage::create(OtherMessageSource, WarningMessageLevel, String("<link rel=preload> has an invalid `href` value")));
-        return nullptr;
-    }
-    Resource::Type type = LinkLoader::getTypeFromAsAttribute(as, &document);
-    ResourceRequest resourceRequest(document.completeURL(href));
-    ResourceFetcher::determineRequestContext(resourceRequest, type, false);
-    FetchRequest linkRequest(resourceRequest, FetchInitiatorTypeNames::link);
-
-    linkRequest.setPriority(document.fetcher()->loadPriority(type, linkRequest));
-    Settings* settings = document.settings();
-    if (settings && settings->logPreload())
-        document.addConsoleMessage(ConsoleMessage::create(OtherMessageSource, DebugMessageLevel, String("Preload triggered for " + href.host() + href.path())));
-    linkRequest.setForPreload(true);
-    linkRequest.setAvoidBlockingOnLoad(true);
-    return document.loader()->startPreload(type, linkRequest);
-}
-
 bool LinkLoader::loadLinkFromHeader(const String& headerValue, Document* document, const NetworkHintsInterface& networkHintsInterface, CanLoadResources canLoadResources)
 {
     if (!document)
         return false;
     LinkHeaderSet headerSet(headerValue);
     for (auto& header : headerSet) {
         if (!header.valid() || header.url().isEmpty() || header.rel().isEmpty())
             return false;
 
         LinkRelAttribute relAttribute(header.rel());
@@ skipping 17 matching lines @@
 {
     // TODO(yoav): Do all links need to load only after they're in document???
 
     // TODO(yoav): Convert all uses of the CrossOriginAttribute to CrossOriginAttributeValue. crbug.com/486689
     // FIXME(crbug.com/463266): We're ignoring type here. Maybe we shouldn't.
     dnsPrefetchIfNeeded(relAttribute, href, document, networkHintsInterface, LinkCalledFromMarkup);
 
     preconnectIfNeeded(relAttribute, href, document, crossOrigin, networkHintsInterface, LinkCalledFromMarkup);
 
     if (m_client->shouldLoadLink())
-        createLinkPreloadResourceClient(preloadIfNeeded(relAttribute, href, document, as));
+        preloadIfNeeded(relAttribute, href, document, as);
 
     // FIXME(crbug.com/323096): Should take care of import.
     if ((relAttribute.isLinkPrefetch() || relAttribute.isLinkSubresource()) && href.isValid() && document.frame()) {
         if (!m_client->shouldLoadLink())
             return false;
         Resource::Type type = Resource::LinkPrefetch;
         if (relAttribute.isLinkSubresource()) {
             type = Resource::LinkSubresource;
             UseCounter::count(document, UseCounter::LinkRelSubresource);
         } else {
@@ skipping 27 matching lines @@
     // atomic (dns prefetch).
     if (m_prerender) {
         m_prerender->cancel();
         m_prerender.clear();
     }
 }
 
 DEFINE_TRACE(LinkLoader)
 {
     visitor->trace(m_prerender);
-    visitor->trace(m_linkPreloadResourceClient);
 }
 
 }