Source/WebCore/loader/cache/CachedResourceLoader.h - Issue 8037034: Merge 95580 - Invoke CachedResourceLoader::canRequest for all URLs in a redirect chain

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/WebCore/loader/cache/CachedResourceLoader.h

Issue 8037034: Merge 95580 - Invoke CachedResourceLoader::canRequest for all URLs in a redirect chain (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/835/

Patch Set: Created 9 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « LayoutTests/http/tests/security/resources/cross-origin-xsl-redirect.xml ('k') | Source/WebCore/loader/cache/CachedResourceRequest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/WebCore/loader/cache/CachedResourceLoader.h

===================================================================

--- Source/WebCore/loader/cache/CachedResourceLoader.h (revision 95976)

+++ Source/WebCore/loader/cache/CachedResourceLoader.h (working copy)

@@ -104,7 +104,7 @@

void preload(CachedResource::Type, ResourceRequest&, const String& charset, bool referencedFromBody);

void checkForPendingPreloads();

void printPreloadStats();

- bool checkInsecureContent(CachedResource::Type, const KURL&) const;

+ bool canRequest(CachedResource::Type, const KURL&, bool forPreload = false);

private:

CachedResource* requestResource(CachedResource::Type, ResourceRequest&, const String& charset, ResourceLoadPriority = ResourceLoadPriorityUnresolved, bool isPreload = false);

@@ -116,7 +116,7 @@

RevalidationPolicy determineRevalidationPolicy(CachedResource::Type, ResourceRequest&, bool forPreload, CachedResource* existingResource) const;

void notifyLoadedFromMemoryCache(CachedResource*);

- bool canRequest(CachedResource::Type, const KURL&, bool forPreload = false);

+ bool checkInsecureContent(CachedResource::Type, const KURL&) const;

void garbageCollectDocumentResourcesTimerFired(Timer<CachedResourceLoader>*);

void performPostLoadActions();