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

Unified Diff: third_party/WebKit/Source/platform/loader/fetch/ResourceLoader.cpp

Issue 2584423002: Loading: move core/fetch to platform/loader/fetch (Closed)
Patch Set: another try Created 3 years, 11 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
Index: third_party/WebKit/Source/platform/loader/fetch/ResourceLoader.cpp
diff --git a/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp b/third_party/WebKit/Source/platform/loader/fetch/ResourceLoader.cpp
similarity index 98%
rename from third_party/WebKit/Source/core/fetch/ResourceLoader.cpp
rename to third_party/WebKit/Source/platform/loader/fetch/ResourceLoader.cpp
index 7f11fb7e3efb0206727a53ebf1397a4cc64f2195..510afc9cc5a188453f7b19aeebbbefb60964adc7 100644
--- a/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp
+++ b/third_party/WebKit/Source/platform/loader/fetch/ResourceLoader.cpp
@@ -27,15 +27,15 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "core/fetch/ResourceLoader.h"
+#include "platform/loader/fetch/ResourceLoader.h"
-#include "core/fetch/CrossOriginAccessControl.h"
-#include "core/fetch/FetchContext.h"
-#include "core/fetch/Resource.h"
-#include "core/fetch/ResourceFetcher.h"
#include "platform/SharedBuffer.h"
#include "platform/exported/WrappedResourceRequest.h"
#include "platform/exported/WrappedResourceResponse.h"
+#include "platform/loader/fetch/CrossOriginAccessControl.h"
+#include "platform/loader/fetch/FetchContext.h"
+#include "platform/loader/fetch/Resource.h"
+#include "platform/loader/fetch/ResourceFetcher.h"
#include "platform/network/NetworkInstrumentation.h"
#include "platform/network/ResourceError.h"
#include "public/platform/Platform.h"
@@ -135,9 +135,10 @@ void ResourceLoader::cancelForRedirectAccessCheckError(
ResourceRequestBlockedReason blockedReason) {
m_resource->willNotFollowRedirect();
- if (m_loader)
+ if (m_loader) {
handleError(
ResourceError::cancelledDueToAccessCheckError(newURL, blockedReason));
+ }
}
static bool isManualRedirectFetchRequest(const ResourceRequest& request) {

Powered by Google App Engine
This is Rietveld 408576698