Source/core/fetch/ResourceFetcher.h - Issue 149643003: Improve handling of CORS redirects for some resource loads.

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

Issue 149643003: Improve handling of CORS redirects for some resource loads. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Use canRequest() when checking redirect origin; remove redundant null checks. Created 6 years, 10 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 | « Source/core/fetch/CrossOriginAccessControl.cpp ('k') | Source/core/fetch/ResourceFetcher.cpp » ('j') | no next file with comments »

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 133 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
144 virtual void willSendRequest(unsigned long identifier, ResourceRequest&, con st ResourceResponse& redirectResponse, const FetchInitiatorInfo&) OVERRIDE;	144 virtual void willSendRequest(unsigned long identifier, ResourceRequest&, con st ResourceResponse& redirectResponse, const FetchInitiatorInfo&) OVERRIDE;

145 virtual void didReceiveResponse(const Resource*, const ResourceResponse&) OV ERRIDE;	145 virtual void didReceiveResponse(const Resource*, const ResourceResponse&) OV ERRIDE;

146 virtual void didReceiveData(const Resource, const char data, int dataLengt h, int encodedDataLength) OVERRIDE;	146 virtual void didReceiveData(const Resource, const char data, int dataLengt h, int encodedDataLength) OVERRIDE;

147 virtual void didDownloadData(const Resource*, int dataLength, int encodedDat aLength) OVERRIDE;	147 virtual void didDownloadData(const Resource*, int dataLength, int encodedDat aLength) OVERRIDE;

148 virtual void subresourceLoaderFinishedLoadingOnePart(ResourceLoader*) OVERRI DE;	148 virtual void subresourceLoaderFinishedLoadingOnePart(ResourceLoader*) OVERRI DE;

149 virtual void didInitializeResourceLoader(ResourceLoader*) OVERRIDE;	149 virtual void didInitializeResourceLoader(ResourceLoader*) OVERRIDE;

150 virtual void willTerminateResourceLoader(ResourceLoader*) OVERRIDE;	150 virtual void willTerminateResourceLoader(ResourceLoader*) OVERRIDE;

151 virtual void willStartLoadingResource(ResourceRequest&) OVERRIDE;	151 virtual void willStartLoadingResource(ResourceRequest&) OVERRIDE;

152 virtual bool defersLoading() const OVERRIDE;	152 virtual bool defersLoading() const OVERRIDE;

153 virtual bool isLoadedBy(ResourceLoaderHost*) const OVERRIDE;	153 virtual bool isLoadedBy(ResourceLoaderHost*) const OVERRIDE;

154 virtual bool shouldRequest(Resource*, const ResourceRequest&, const Resource LoaderOptions&) OVERRIDE;	154 virtual bool canAccessRedirect(Resource*, ResourceRequest&, const ResourceRe sponse&, ResourceLoaderOptions&) OVERRIDE;

155 virtual bool canAccessResource(Resource*, const KURL&) const OVERRIDE;	155 virtual bool canAccessResource(Resource, SecurityOrigin, const KURL&) cons t OVERRIDE;

	156

156 virtual void refResourceLoaderHost() OVERRIDE;	157 virtual void refResourceLoaderHost() OVERRIDE;

157 virtual void derefResourceLoaderHost() OVERRIDE;	158 virtual void derefResourceLoaderHost() OVERRIDE;

158	159

159 static const ResourceLoaderOptions& defaultResourceOptions();	160 static const ResourceLoaderOptions& defaultResourceOptions();

160 private:	161 private:

161	162

162 explicit ResourceFetcher(DocumentLoader*);	163 explicit ResourceFetcher(DocumentLoader*);

163	164

164 bool shouldLoadNewResource(Resource::Type) const;	165 bool shouldLoadNewResource(Resource::Type) const;

165	166

(...skipping 95 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
261 m_loader->m_allowStaleResources = m_previousState;	262 m_loader->m_allowStaleResources = m_previousState;

262 }	263 }

263 private:	264 private:

264 ResourceFetcher* m_loader;	265 ResourceFetcher* m_loader;

265 bool m_previousState;	266 bool m_previousState;

266 };	267 };

267	268

268 } // namespace WebCore	269 } // namespace WebCore

269	270

270 #endif	271 #endif

OLD	NEW