Merge 95580 - Invoke CachedResourceLoader::canRequest for all URLs in a redirect chain

Source/WebCore/loader/cache/CachedResourceRequest.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) 2006 Samuel Weinig (sam.weinig@gmail.com)
     Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
 
     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 118 matching lines @@
             memoryCache()->revalidationFailed(resource); 
         resource->error(CachedResource::LoadError);
         return PassOwnPtr<CachedResourceRequest>(nullptr);
     }
     request->m_loader = loader;
     return request.release();
 }
 
 void CachedResourceRequest::willSendRequest(SubresourceLoader* loader, ResourceRequest& req, const ResourceResponse&)
 {
-    if (!m_cachedResourceLoader->checkInsecureContent(m_resource->type(), req.url())) {
+    if (!m_cachedResourceLoader->canRequest(m_resource->type(), req.url())) {
         loader->cancel();
         return;
     }
     m_resource->setRequestedFromNetworkingLayer();
 }
 
 void CachedResourceRequest::didFinishLoading(SubresourceLoader* loader, double)
 {
     if (m_finishing)
         return;
@@ skipping 128 matching lines @@
     m_resource->setSerializedCachedMetadata(data, size);
 }
     
 void CachedResourceRequest::end()
 {
     m_cachedResourceLoader->loadDone();
     m_resource->stopLoading();
 }
 
 } //namespace WebCore