Turn off isLinkPreload() when used

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

Index: third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
diff --git a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
index 5ff0d0d3861a31c60532f733a76016d704734229..903e5f2795cc70aa5356dcbe64f12c578f1a557a 100644
--- a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
+++ b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
@@ -474,6 +474,8 @@ Resource* ResourceFetcher::requestResource(FetchRequest& request, const Resource
         initializeRevalidation(request.mutableResourceRequest(), resource);
         break;
     case Use:
+        if (resource->isLinkPreload() && !request.isLinkPreload())
+            resource->setLinkPreload(false);
         memoryCache()->updateForAccess(resource);
         break;
     }
@@ -868,11 +870,11 @@ 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