MixedContentChecker should not log blocked preload requests

Source/core/fetch/ResourceFetcher.cpp

Index: Source/core/fetch/ResourceFetcher.cpp
diff --git a/Source/core/fetch/ResourceFetcher.cpp b/Source/core/fetch/ResourceFetcher.cpp
index 68f29110590e6be5b393177aaab507a390eda98f..5269ee4862e45dc128fe19dc94beac0b38f50871 100644
--- a/Source/core/fetch/ResourceFetcher.cpp
+++ b/Source/core/fetch/ResourceFetcher.cpp
@@ -591,7 +591,8 @@ bool ResourceFetcher::canRequest(Resource::Type type, const ResourceRequest& res
             effectiveFrame = toLocalFrame(frame()->tree().parent());
     }
 
-    return !MixedContentChecker::shouldBlockFetch(effectiveFrame, resourceRequest, url);
+    MixedContentChecker::SuppressLogType suppressLog = forPreload ? MixedContentChecker::SuppressLog : MixedContentChecker::LogIfBlocked;
+    return !MixedContentChecker::shouldBlockFetch(effectiveFrame, resourceRequest, url, suppressLog);
 }
 
 bool ResourceFetcher::canAccessResource(Resource* resource, SecurityOrigin* sourceOrigin, const KURL& url) const
@@ -674,7 +675,8 @@ void ResourceFetcher::maybeNotifyInsecureContent(const Resource* resource) const
     // As a side effect browser will be notified.
     MixedContentChecker::shouldBlockFetch(frame(),
                                           resource->lastResourceRequest(),
-                                          resource->lastResourceRequest().url());
+                                          resource->lastResourceRequest().url(),
+                                          MixedContentChecker::LogIfBlocked);
 }
 
 void ResourceFetcher::requestLoadStarted(Resource* resource, const FetchRequest& request, ResourceLoadStartType type)
@@ -1254,8 +1256,7 @@ void ResourceFetcher::preload(Resource::Type type, FetchRequest& request, const
     // Loading images involves several special cases, so use dedicated fetch method instead.
     if (type == Resource::Image)
         resource = fetchImage(request);
-
-    if (!resource)
+    else

[Mike West, 2014/11/14 08:08:17]

Why this change?

[kouhei (in TOK), 2014/11/14 09:19:31]

When fetchImage fails from CSP/mixedContent check, it returns null.
Second request which also fails was attempted before this CL.

         resource = requestResource(type, request);
     if (!resource || (m_preloads && m_preloads->contains(resource.get())))
         return;