Fix loading of data: URI images wrt loadsImagesAutomatically setting

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 cd15e1c78b0743685f832fb03db2a66fce09cfd5..eee96cc6f6bf3d63d9abd640091e17ea51f57606 100644
--- a/Source/core/fetch/ResourceFetcher.cpp
+++ b/Source/core/fetch/ResourceFetcher.cpp
@@ -143,7 +143,7 @@ static ResourceLoadPriority loadPriority(Resource::Type type, const FetchRequest
     return ResourceLoadPriorityUnresolved;
 }
 
-static Resource* resourceFromDataURIRequest(const ResourceRequest& request, const ResourceLoaderOptions& resourceOptions)
+static Resource* imageResourceFromDataURIRequest(const ResourceRequest& request, const ResourceLoaderOptions& resourceOptions)
 {
     const KURL& url = request.url();
     ASSERT(url.protocolIsData());
@@ -302,7 +302,7 @@ void ResourceFetcher::preCacheDataURIImage(const FetchRequest& request)
     if (memoryCache()->resourceForURL(url))
         return;
 
-    if (Resource* resource = resourceFromDataURIRequest(request.resourceRequest(), request.options())) {
+    if (Resource* resource = imageResourceFromDataURIRequest(request.resourceRequest(), request.options())) {
         memoryCache()->add(resource);
         scheduleDocumentResourcesGC();
     }
@@ -870,7 +870,10 @@ ResourcePtr<Resource> ResourceFetcher::createResourceForLoading(Resource::Type t
     WTF_LOG(ResourceLoading, "Loading Resource for '%s'.", request.resourceRequest().url().elidedString().latin1().data());
 
     addAdditionalRequestHeaders(request.mutableResourceRequest(), type);
-    ResourcePtr<Resource> resource = createResource(type, request.resourceRequest(), charset);
+    // data: URI images are a special case because they must ignore autoLoadImages setting.
+    ResourcePtr<Resource> resource = type == Resource::Image && request.resourceRequest().url().protocolIsData() ?

[eseidel, 2014/06/26 16:24:35]

Do we want to just push this logic down into createResource? 

[mnaganov (inactive), 2014/06/26 16:42:40]

I don't think so, because imageResourceFromDataURIRequest uses createResource by
itself so we will create an infinite loop :)

+        imageResourceFromDataURIRequest(request.resourceRequest(), request.options()) :
+        createResource(type, request.resourceRequest(), charset);
 
     memoryCache()->add(resource.get());
     return resource;