Set the same headers for data URLs in WebURLLoaderImpl and ResourceFetcher

third_party/WebKit/Source/platform/loader/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
@@ skipping 351 matching lines @@
   const String cacheIdentifier = getCacheIdentifier();
   if (Resource* oldResource =
           memoryCache()->resourceForURL(url, cacheIdentifier)) {
     // There's no reason to re-parse if we saved the data from the previous
     // parse.
     if (request.options().dataBufferingPolicy != DoNotBufferData)
       return oldResource;
     memoryCache()->remove(oldResource);
   }
 
-  AtomicString mimetype;
-  AtomicString charset;
+  ResourceResponse response;
   RefPtr<SharedBuffer> data;
   if (substituteData.isValid()) {
-    mimetype = substituteData.mimeType();
-    charset = substituteData.textEncoding();
     data = substituteData.content();
+    response.setURL(url);
+    response.setMimeType(substituteData.mimeType());
+    response.setExpectedContentLength(data->size());
+    response.setTextEncodingName(substituteData.textEncoding());
   } else if (url.protocolIsData()) {
-    data = PassRefPtr<SharedBuffer>(
-        NetworkUtils::parseDataURL(url, mimetype, charset));
+    data = NetworkUtils::parseDataURLAndPopulateResponse(url, response);
     if (!data)
       return nullptr;
+    // |response| is modified by parseDataURLAndPopulateResponse() and is
+    // ready to be used.
   } else {
     ArchiveResource* archiveResource =
         m_archive->subresourceForURL(request.url());
     // Fall back to the network if the archive doesn't contain the resource.
     if (!archiveResource)
       return nullptr;
-    mimetype = archiveResource->mimeType();
-    charset = archiveResource->textEncoding();
     data = archiveResource->data();
-  }
-
-  ResourceResponse response(url, mimetype, data->size(), charset);
-  if (!substituteData.isValid() && url.protocolIsData()) {
-    response.setHTTPStatusCode(200);
-    response.setHTTPStatusText("OK");
+    response.setURL(url);
+    response.setMimeType(archiveResource->mimeType());
+    response.setExpectedContentLength(data->size());
+    response.setTextEncodingName(archiveResource->textEncoding());
   }
 
   Resource* resource = factory.create(request.resourceRequest(),
                                       request.options(), request.charset());
   resource->setNeedsSynchronousCacheHit(substituteData.forceSynchronousLoad());
   // FIXME: We should provide a body stream here.
   resource->responseReceived(response, nullptr);
   resource->setDataBufferingPolicy(BufferData);
   if (data->size())
     resource->setResourceBuffer(data);
@@ skipping 1144 matching lines @@
   visitor->trace(m_context);
   visitor->trace(m_archive);
   visitor->trace(m_loaders);
   visitor->trace(m_nonBlockingLoaders);
   visitor->trace(m_documentResources);
   visitor->trace(m_preloads);
   visitor->trace(m_resourceTimingInfoMap);
 }
 
 }  // namespace blink