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

Unified Diff: Source/core/fetch/RawResource.cpp

Issue 1291883002: Use precaching for more data: urls than just images. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Tweak determineRevalidationPolicy ordering Created 5 years, 4 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 | « Source/core/fetch/RawResource.h ('k') | Source/core/fetch/ResourceFetcher.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/fetch/RawResource.cpp
diff --git a/Source/core/fetch/RawResource.cpp b/Source/core/fetch/RawResource.cpp
index 918723de7eac9868dcab67e6a32998d626fb8848..ece0478f99e5bb321d49d1299293b87df9191c60 100644
--- a/Source/core/fetch/RawResource.cpp
+++ b/Source/core/fetch/RawResource.cpp
@@ -31,31 +31,9 @@
#include "core/fetch/ResourceClientWalker.h"
#include "core/fetch/ResourceFetcher.h"
#include "core/fetch/ResourceLoader.h"
-#include "core/fetch/SubstituteData.h"
-#include "platform/SharedBuffer.h"
namespace blink {
-void RawResource::preCacheSubstituteDataForMainResource(const FetchRequest& request, ResourceFetcher* fetcher, const SubstituteData& substituteData)
-{
- const String cacheIdentifier = fetcher->getCacheIdentifier();
- const KURL& url = request.url();
- if (Resource* oldResource = memoryCache()->resourceForURL(url, cacheIdentifier))
- memoryCache()->remove(oldResource);
-
- ResourceResponse response(url, substituteData.mimeType(), substituteData.content()->size(), substituteData.textEncoding(), emptyString());
- ResourcePtr<Resource> resource = new RawResource(request.resourceRequest(), Resource::MainResource);
- resource->setNeedsSynchronousCacheHit(substituteData.forceSynchronousLoad());
- resource->setOptions(request.options());
- resource->setDataBufferingPolicy(BufferData);
- resource->responseReceived(response, nullptr);
- if (substituteData.content()->size())
- resource->setResourceBuffer(substituteData.content());
- resource->setCacheIdentifier(cacheIdentifier);
- resource->finish();
- memoryCache()->add(resource.get());
-}
-
ResourcePtr<Resource> RawResource::fetchSynchronously(FetchRequest& request, ResourceFetcher* fetcher)
{
request.mutableResourceRequest().setTimeoutInterval(10);
@@ -85,9 +63,7 @@ ResourcePtr<RawResource> RawResource::fetchMainResource(FetchRequest& request, R
ASSERT(request.resourceRequest().frameType() != WebURLRequest::FrameTypeNone);
ASSERT(request.resourceRequest().requestContext() == WebURLRequest::RequestContextForm || request.resourceRequest().requestContext() == WebURLRequest::RequestContextFrame || request.resourceRequest().requestContext() == WebURLRequest::RequestContextHyperlink || request.resourceRequest().requestContext() == WebURLRequest::RequestContextIframe || request.resourceRequest().requestContext() == WebURLRequest::RequestContextInternal || request.resourceRequest().requestContext() == WebURLRequest::RequestContextLocation);
- if (substituteData.isValid())
- preCacheSubstituteDataForMainResource(request, fetcher, substituteData);
- return toRawResource(fetcher->requestResource(request, RawResourceFactory(Resource::MainResource)));
+ return toRawResource(fetcher->requestResource(request, RawResourceFactory(Resource::MainResource), substituteData));
}
ResourcePtr<RawResource> RawResource::fetchMedia(FetchRequest& request, ResourceFetcher* fetcher)
« no previous file with comments | « Source/core/fetch/RawResource.h ('k') | Source/core/fetch/ResourceFetcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698