Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(135)

Unified Diff: sky/engine/core/fetch/ResourceFetcher.cpp

Issue 691623003: Remove Platform::parseDataURL (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/core/fetch/ResourceFetcher.h ('k') | sky/engine/public/platform/Platform.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/fetch/ResourceFetcher.cpp
diff --git a/sky/engine/core/fetch/ResourceFetcher.cpp b/sky/engine/core/fetch/ResourceFetcher.cpp
index 576c3925922ad8395ba3cd9327bde20a66313b01..2eac75ae095f4a397ab511a4199fdfbb25381f09 100644
--- a/sky/engine/core/fetch/ResourceFetcher.cpp
+++ b/sky/engine/core/fetch/ResourceFetcher.cpp
@@ -114,27 +114,6 @@ static ResourceLoadPriority loadPriority(Resource::Type type, const FetchRequest
return ResourceLoadPriorityUnresolved;
}
-static Resource* resourceFromDataURIRequest(const ResourceRequest& request, const ResourceLoaderOptions& resourceOptions)
-{
- const KURL& url = request.url();
- ASSERT(url.protocolIsData());
-
- blink::WebString mimetype;
- blink::WebString charset;
- RefPtr<SharedBuffer> data = PassRefPtr<SharedBuffer>(blink::Platform::current()->parseDataURL(url, mimetype, charset));
- if (!data)
- return 0;
- ResourceResponse response(url, mimetype, data->size(), charset, String());
-
- Resource* resource = createResource(Resource::Image, request, charset);
- resource->setOptions(resourceOptions);
- resource->responseReceived(response);
- if (data->size())
- resource->setResourceBuffer(data);
- resource->finish();
- return resource;
-}
-
static WebURLRequest::RequestContext requestContextFromType(const ResourceFetcher* fetcher, Resource::Type type)
{
switch (type) {
@@ -207,28 +186,11 @@ FetchContext& ResourceFetcher::context() const
ResourcePtr<ImageResource> ResourceFetcher::fetchImage(FetchRequest& request)
{
- if (request.resourceRequest().url().protocolIsData())
- preCacheDataURIImage(request);
-
request.setDefer(clientDefersImage(request.resourceRequest().url()) ? FetchRequest::DeferredByClient : FetchRequest::NoDefer);
ResourcePtr<Resource> resource = requestResource(Resource::Image, request);
return resource && resource->type() == Resource::Image ? toImageResource(resource) : 0;
}
-void ResourceFetcher::preCacheDataURIImage(const FetchRequest& request)
-{
- const KURL& url = request.resourceRequest().url();
- ASSERT(url.protocolIsData());
-
- if (memoryCache()->resourceForURL(url))
- return;
-
- if (Resource* resource = resourceFromDataURIRequest(request.resourceRequest(), request.options())) {
- memoryCache()->add(resource);
- scheduleDocumentResourcesGC();
- }
-}
-
ResourcePtr<FontResource> ResourceFetcher::fetchFont(FetchRequest& request)
{
ASSERT(request.resourceRequest().frameType() == WebURLRequest::FrameTypeNone);
« no previous file with comments | « sky/engine/core/fetch/ResourceFetcher.h ('k') | sky/engine/public/platform/Platform.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698