third_party/WebKit/Source/core/fetch/ResourceFetcher.h - Issue 2231523002: Make ResourceFetcher return Resources with LoadError instead of nullptrs.

Side by Side Diff: third_party/WebKit/Source/core/fetch/ResourceFetcher.h

Issue 2231523002: Make ResourceFetcher return Resources with LoadError instead of nullptrs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed webkit_unit_tests. Fixed most layout tests, rebaselineing rest. Created 4 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 unified diff | Download patch

« no previous file with comments | « third_party/WebKit/Source/core/fetch/Resource.cpp ('k') | third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp » ('j') | third_party/WebKit/Source/core/loader/DocumentLoader.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)	2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)

3 Copyright (C) 2001 Dirk Mueller <mueller@kde.org>	3 Copyright (C) 2001 Dirk Mueller <mueller@kde.org>

4 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.	4 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.

5 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/	5 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/

6	6

7 This library is free software; you can redistribute it and/or	7 This library is free software; you can redistribute it and/or

8 modify it under the terms of the GNU Library General Public	8 modify it under the terms of the GNU Library General Public

9 License as published by the Free Software Foundation; either	9 License as published by the Free Software Foundation; either

10 version 2 of the License, or (at your option) any later version.	10 version 2 of the License, or (at your option) any later version.

(...skipping 137 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
148 friend class ResourceCacheValidationSuppressor;	148 friend class ResourceCacheValidationSuppressor;

149	149

150 explicit ResourceFetcher(FetchContext*);	150 explicit ResourceFetcher(FetchContext*);

151	151

152 void initializeRevalidation(ResourceRequest&, Resource*);	152 void initializeRevalidation(ResourceRequest&, Resource*);

153 Resource* createResourceForLoading(FetchRequest&, const String& charset, con st ResourceFactory&);	153 Resource* createResourceForLoading(FetchRequest&, const String& charset, con st ResourceFactory&);

154 void storeResourceTimingInitiatorInformation(Resource*);	154 void storeResourceTimingInitiatorInformation(Resource*);

155 ResourceLoadPriority computeLoadPriority(Resource::Type, const FetchRequest& , ResourcePriority::VisibilityStatus);	155 ResourceLoadPriority computeLoadPriority(Resource::Type, const FetchRequest& , ResourcePriority::VisibilityStatus);

156	156

157 Resource* resourceForStaticData(const FetchRequest&, const ResourceFactory&, const SubstituteData&);	157 Resource* resourceForStaticData(const FetchRequest&, const ResourceFactory&, const SubstituteData&);

	158 Resource* resourceForBlockedRequest(const FetchRequest&, const ResourceFacto ry&);

158	159

159 // RevalidationPolicy enum values are used in UMAs https://crbug.com/579496.	160 // RevalidationPolicy enum values are used in UMAs https://crbug.com/579496.

160 enum RevalidationPolicy { Use, Revalidate, Reload, Load };	161 enum RevalidationPolicy { Use, Revalidate, Reload, Load };

161 RevalidationPolicy determineRevalidationPolicy(Resource::Type, const FetchRe quest&, Resource* existingResource, bool isStaticData) const;	162 RevalidationPolicy determineRevalidationPolicy(Resource::Type, const FetchRe quest&, Resource* existingResource, bool isStaticData) const;

162	163

163 void moveCachedNonBlockingResourceToBlocking(Resource*, const FetchRequest&) ;	164 void moveCachedNonBlockingResourceToBlocking(Resource*, const FetchRequest&) ;

164 void moveResourceLoaderToNonBlocking(ResourceLoader*);	165 void moveResourceLoaderToNonBlocking(ResourceLoader*);

165 void removeResourceLoader(ResourceLoader*);	166 void removeResourceLoader(ResourceLoader*);

166	167

167 void initializeResourceRequest(ResourceRequest&, Resource::Type, FetchReques t::DeferOption);	168 void initializeResourceRequest(ResourceRequest&, Resource::Type, FetchReques t::DeferOption);

(...skipping 71 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
239 m_loader->m_allowStaleResources = m_previousState;	240 m_loader->m_allowStaleResources = m_previousState;

240 }	241 }

241 private:	242 private:

242 Member<ResourceFetcher> m_loader;	243 Member<ResourceFetcher> m_loader;

243 bool m_previousState;	244 bool m_previousState;

244 };	245 };

245	246

246 } // namespace blink	247 } // namespace blink

247	248

248 #endif // ResourceFetcher_h	249 #endif // ResourceFetcher_h

OLD	NEW