Turn off isLinkPreload() when used

third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
     Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
     Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
     Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
 
     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
@@ skipping 456 matching lines @@
     case Reload:
         memoryCache()->remove(resource);
         // Fall through
     case Load:
         resource = createResourceForLoading(request, request.charset(), factory);
         break;
     case Revalidate:
         initializeRevalidation(request.mutableResourceRequest(), resource);
         break;
     case Use:
+        if (resource->isLinkPreload() && !request.isLinkPreload())
+            resource->setLinkPreload(false);
         memoryCache()->updateForAccess(resource);
         break;
     }
 
     if (!resource)
         return nullptr;
     if (resource->getType() != factory.type()) {
         ASSERT(request.forPreload());
         return nullptr;
     }
@@ skipping 374 matching lines @@
 bool ResourceFetcher::hasPendingRequest() const
 {
     return m_loaders.size() > 0 || m_nonBlockingLoaders.size() > 0;
 }
 
 void ResourceFetcher::preloadStarted(Resource* resource)
 {
     if (m_preloads && m_preloads->contains(resource))
         return;
     TRACE_EVENT_ASYNC_STEP_INTO0("blink.net", "Resource", resource->identifier(), "Preload");
-    resource->increasePreloadCount();
 
     if (!m_preloads)
         m_preloads = new HeapListHashSet<Member<Resource>>;
-    m_preloads->add(resource);
+    if (m_preloads->add(resource).isNewEntry)

[Nate Chapin, 2016/09/12 20:44:51]

Why doesn't the m_preloads->contains(resource) above catch the case where
isNewEntry would be false?

[Yoav Weiss, 2016/09/12 21:01:16]

You're right. It does.

+        resource->increasePreloadCount();
 }
 
 bool ResourceFetcher::isPreloaded(const KURL& url) const
 {
     if (m_preloads) {
         for (auto resource : *m_preloads) {
             if (resource->url() == url)
                 return true;
         }
     }
@@ skipping 437 matching lines @@
     visitor->trace(m_context);
     visitor->trace(m_archive);
     visitor->trace(m_loaders);
     visitor->trace(m_nonBlockingLoaders);
     visitor->trace(m_documentResources);
     visitor->trace(m_preloads);
     visitor->trace(m_resourceTimingInfoMap);
 }
 
 } // namespace blink