Collapse images disallowed by the Safe Browsing Subresource Filter.

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

Index: third_party/WebKit/Source/core/fetch/ResourceLoader.cpp
diff --git a/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp b/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp
index 38a79ac10119a0df586b9a2b230f1d4b56bf2417..cd731b2294fd9dc187f24589b957fb174e84e6d7 100644
--- a/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp
+++ b/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp
@@ -136,11 +136,15 @@ void ResourceLoader::cancel() {
       ResourceError::cancelledError(m_resource->lastResourceRequest().url()));
 }
 
-void ResourceLoader::cancelForRedirectAccessCheckError(const KURL& newURL) {
+void ResourceLoader::cancelForRedirectAccessCheckError(
+    const KURL& newURL,
+    ResourceRequestBlockedReason blockedReason) {
   m_resource->willNotFollowRedirect();
 
-  if (m_loader)
-    didFail(ResourceError::cancelledDueToAccessCheckError(newURL));
+  if (m_loader) {
+    didFail(
+        ResourceError::cancelledDueToAccessCheckError(newURL, blockedReason));
+  }
 }
 
 bool ResourceLoader::willFollowRedirect(
@@ -165,9 +169,10 @@ bool ResourceLoader::willFollowRedirect(
 
   const KURL originalURL = newRequest.url();
 
-  if (!m_fetcher->willFollowRedirect(m_resource.get(), newRequest,
-                                     redirectResponse)) {
-    cancelForRedirectAccessCheckError(newRequest.url());
+  ResourceRequestBlockedReason blockedReason = m_fetcher->willFollowRedirect(
+      m_resource.get(), newRequest, redirectResponse);
+  if (blockedReason != ResourceRequestBlockedReason::None) {
+    cancelForRedirectAccessCheckError(newRequest.url(), blockedReason);
     return false;
   }
 
@@ -178,12 +183,14 @@ bool ResourceLoader::willFollowRedirect(
   // rewriting but currently we cannot. So, return false to make the
   // redirect fail.
   if (newRequest.url() != originalURL) {
-    cancelForRedirectAccessCheckError(newRequest.url());
+    cancelForRedirectAccessCheckError(newRequest.url(),
+                                      ResourceRequestBlockedReason::Other);
     return false;
   }
 
   if (!m_resource->willFollowRedirect(newRequest, redirectResponse)) {
-    cancelForRedirectAccessCheckError(newRequest.url());
+    cancelForRedirectAccessCheckError(newRequest.url(),
+                                      ResourceRequestBlockedReason::Other);
     return false;
   }