MixedContentChecker should not log blocked preload requests

Source/core/fetch/ResourceFetcher.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) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
     Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
 
     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 573 matching lines @@
 
     // If we're loading the main resource of a subframe, ensure that we check
     // against the parent of the active frame, rather than the frame itself.
     LocalFrame* effectiveFrame = frame();
     if (resourceRequest.frameType() == WebURLRequest::FrameTypeNested) {
         // FIXME: Deal with RemoteFrames.
         if (frame()->tree().parent()->isLocalFrame())
             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
 {
     // Redirects can change the response URL different from one of request.
     if (!canRequest(resource->type(), resource->resourceRequest(), url, resource->options(), resource->isUnusedPreload(), FetchRequest::UseDefaultOriginRestrictionForType))
         return false;
 
     if (!sourceOrigin && document())
         sourceOrigin = document()->securityOrigin();
@@ skipping 62 matching lines @@
     if (resource->stillNeedsLoad())
         return true;
     return request.options().synchronousPolicy == RequestSynchronously && resource->isLoading();
 }
 
 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)
 {
     if (type == ResourceLoadingFromCache)
         notifyLoadedFromMemoryCache(resource);
 
     if (request.resourceRequest().url().protocolIsData() || (m_documentLoader && m_documentLoader->substituteData().isValid()))
         return;
 
@@ skipping 559 matching lines @@
         determineRequestContext(request.mutableResourceRequest(), type);
     }
 
     request.setCharset(encoding);
     request.setForPreload(true);
 
     ResourcePtr<Resource> resource;
     // 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;
     TRACE_EVENT_ASYNC_STEP_INTO0("net", "Resource", resource.get(), "Preload");
     resource->increasePreloadCount();
 
     if (!m_preloads)
         m_preloads = adoptPtr(new ListHashSet<Resource*>);
     m_preloads->add(resource.get());
 
@@ skipping 296 matching lines @@
 
 void ResourceFetcher::trace(Visitor* visitor)
 {
     visitor->trace(m_document);
     visitor->trace(m_loaders);
     visitor->trace(m_multipartLoaders);
     ResourceLoaderHost::trace(visitor);
 }
 
 }