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

Side by Side Diff: Source/core/loader/DocumentLoader.cpp

Issue 14557011: Fix problems with cross-origin redirects. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed typo in numbering in a test. Created 7 years, 7 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
3 * Copyright (C) 2011 Google Inc. All rights reserved. 3 * Copyright (C) 2011 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 1059 matching lines...) Expand 10 before | Expand all | Expand 10 after
1070 1070
1071 if (m_substituteData.isValid()) { 1071 if (m_substituteData.isValid()) {
1072 m_identifierForLoadWithoutResourceLoader = createUniqueIdentifier(); 1072 m_identifierForLoadWithoutResourceLoader = createUniqueIdentifier();
1073 frameLoader()->notifier()->dispatchWillSendRequest(this, m_identifierFor LoadWithoutResourceLoader, m_request, ResourceResponse()); 1073 frameLoader()->notifier()->dispatchWillSendRequest(this, m_identifierFor LoadWithoutResourceLoader, m_request, ResourceResponse());
1074 handleSubstituteDataLoadSoon(); 1074 handleSubstituteDataLoadSoon();
1075 return; 1075 return;
1076 } 1076 }
1077 1077
1078 ResourceRequest request(m_request); 1078 ResourceRequest request(m_request);
1079 DEFINE_STATIC_LOCAL(ResourceLoaderOptions, mainResourceLoadOptions, 1079 DEFINE_STATIC_LOCAL(ResourceLoaderOptions, mainResourceLoadOptions,
1080 (SendCallbacks, SniffContent, BufferData, AllowStoredCredentials, AskCli entForCrossOriginCredentials, SkipSecurityCheck)); 1080 (SendCallbacks, SniffContent, BufferData, AllowStoredCredentials, Client RequestedCredentials, AskClientForCrossOriginCredentials, SkipSecurityCheck));
1081 CachedResourceRequest cachedResourceRequest(request, mainResourceLoadOptions ); 1081 CachedResourceRequest cachedResourceRequest(request, mainResourceLoadOptions );
1082 m_mainResource = m_cachedResourceLoader->requestMainResource(cachedResourceR equest); 1082 m_mainResource = m_cachedResourceLoader->requestMainResource(cachedResourceR equest);
1083 if (!m_mainResource) { 1083 if (!m_mainResource) {
1084 setRequest(ResourceRequest()); 1084 setRequest(ResourceRequest());
1085 // If the load was aborted by clearing m_request, it's possible the Appl icationCacheHost 1085 // If the load was aborted by clearing m_request, it's possible the Appl icationCacheHost
1086 // is now in a state where starting an empty load will be inconsistent. Replace it with 1086 // is now in a state where starting an empty load will be inconsistent. Replace it with
1087 // a new ApplicationCacheHost. 1087 // a new ApplicationCacheHost.
1088 m_applicationCacheHost = adoptPtr(new ApplicationCacheHost(this)); 1088 m_applicationCacheHost = adoptPtr(new ApplicationCacheHost(this));
1089 maybeLoadEmpty(); 1089 maybeLoadEmpty();
1090 return; 1090 return;
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
1138 commitLoad(resourceData->data(), resourceData->size()); 1138 commitLoad(resourceData->data(), resourceData->size());
1139 } 1139 }
1140 1140
1141 void DocumentLoader::handledOnloadEvents() 1141 void DocumentLoader::handledOnloadEvents()
1142 { 1142 {
1143 m_wasOnloadHandled = true; 1143 m_wasOnloadHandled = true;
1144 applicationCacheHost()->stopDeferringEvents(); 1144 applicationCacheHost()->stopDeferringEvents();
1145 } 1145 }
1146 1146
1147 } // namespace WebCore 1147 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698