Index: Source/core/fetch/ResourceFetcher.h |
diff --git a/Source/core/fetch/ResourceFetcher.h b/Source/core/fetch/ResourceFetcher.h |
index 5f1b975d28c7f7b723980bcaceedb56152da1655..89085bcf7f75b07002cf82f21e31ad9c0ca5a24d 100644 |
--- a/Source/core/fetch/ResourceFetcher.h |
+++ b/Source/core/fetch/ResourceFetcher.h |
@@ -81,8 +81,7 @@ public: |
using RefCounted<ResourceFetcher>::ref; |
using RefCounted<ResourceFetcher>::deref; |
- unsigned long fetchSynchronously(const ResourceRequest&, StoredCredentials, ResourceError&, ResourceResponse&, Vector<char>&); |
- |
+ ResourcePtr<Resource> fetchSynchronously(FetchRequest&); |
ResourcePtr<ImageResource> fetchImage(FetchRequest&); |
ResourcePtr<CSSStyleSheetResource> fetchCSSStyleSheet(FetchRequest&); |
ResourcePtr<CSSStyleSheetResource> fetchUserCSSStyleSheet(FetchRequest&); |
@@ -131,9 +130,7 @@ public: |
void preload(Resource::Type, FetchRequest&, const String& charset); |
void checkForPendingPreloads(); |
void printPreloadStats(); |
- bool canRequest(Resource::Type, const KURL&, const ResourceLoaderOptions&, bool forPreload = false); |
bool canAccess(Resource*); |
- bool checkInsecureContent(Resource::Type, const KURL&, MixedContentBlockingTreatment) const; |
void setDefersLoading(bool); |
void stopFetching(); |
@@ -181,6 +178,9 @@ private: |
ResourceRequestCachePolicy resourceRequestCachePolicy(const ResourceRequest&, Resource::Type); |
void addAdditionalRequestHeaders(ResourceRequest&, Resource::Type); |
+ bool canRequest(Resource::Type, const KURL&, const ResourceLoaderOptions&, bool forPreload = false); |
+ bool checkInsecureContent(Resource::Type, const KURL&, MixedContentBlockingTreatment) const; |
+ |
void notifyLoadedFromMemoryCache(Resource*); |
void garbageCollectDocumentResourcesTimerFired(Timer<ResourceFetcher>*); |