Fix link header preload on subresources

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

Index: third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
diff --git a/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp b/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
index 27d73c65b884d366ba098736c80de34c6a78dd87..2d3da9d1778f88c8f2cd2e146848c36172fed422 100644
--- a/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
@@ -251,12 +251,14 @@ void FrameFetchContext::dispatchWillSendRequest(unsigned long identifier, Resour
 void FrameFetchContext::dispatchDidReceiveResponse(unsigned long identifier, const ResourceResponse& response, ResourceLoader* resourceLoader)
 {
     MixedContentChecker::checkMixedPrivatePublic(frame(), response.remoteIPAddress());
-    LinkLoader::loadLinkFromHeader(response.httpHeaderField(HTTPNames::Link), frame()->document(), NetworkHintsInterfaceImpl(), LinkLoader::DoNotLoadResources);

[Nate Chapin, 2016/01/25 21:50:10]

Maybe keep the loadLinkFromHeader() call here, and just vary the
DoNotLoadResources/LoadResourcesAndPreconnect, with a comment explaining why.

[Yoav Weiss, 2016/01/25 22:12:45]

Yeah. Certainly DRYer to have a single call. I'll move it after the condition,
so we won't have to branch twice.

     if (m_documentLoader == frame()->loader().provisionalDocumentLoader()) {
+        LinkLoader::loadLinkFromHeader(response.httpHeaderField(HTTPNames::Link), frame()->document(), NetworkHintsInterfaceImpl(), LinkLoader::DoNotLoadResources);
         ResourceFetcher* fetcher = nullptr;
         if (frame()->document())
             fetcher = frame()->document()->fetcher();
         m_documentLoader->clientHintsPreferences().updateFromAcceptClientHintsHeader(response.httpHeaderField(HTTPNames::Accept_CH), fetcher);
+    } else {
+        LinkLoader::loadLinkFromHeader(response.httpHeaderField(HTTPNames::Link), frame()->document(), NetworkHintsInterfaceImpl(), LinkLoader::LoadResourcesAndPreconnect);
     }
 
     if (response.hasMajorCertificateErrors() && resourceLoader)