OLD | NEW |
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 1093 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1104 if (m_substituteData.isValid()) { | 1104 if (m_substituteData.isValid()) { |
1105 m_identifierForLoadWithoutResourceLoader = createUniqueIdentifier(); | 1105 m_identifierForLoadWithoutResourceLoader = createUniqueIdentifier(); |
1106 frameLoader()->notifier()->assignIdentifierToInitialRequest(m_identifier
ForLoadWithoutResourceLoader, this, m_request); | 1106 frameLoader()->notifier()->assignIdentifierToInitialRequest(m_identifier
ForLoadWithoutResourceLoader, this, m_request); |
1107 frameLoader()->notifier()->dispatchWillSendRequest(this, m_identifierFor
LoadWithoutResourceLoader, m_request, ResourceResponse()); | 1107 frameLoader()->notifier()->dispatchWillSendRequest(this, m_identifierFor
LoadWithoutResourceLoader, m_request, ResourceResponse()); |
1108 handleSubstituteDataLoadSoon(); | 1108 handleSubstituteDataLoadSoon(); |
1109 return; | 1109 return; |
1110 } | 1110 } |
1111 | 1111 |
1112 ResourceRequest request(m_request); | 1112 ResourceRequest request(m_request); |
1113 DEFINE_STATIC_LOCAL(ResourceLoaderOptions, mainResourceLoadOptions, | 1113 DEFINE_STATIC_LOCAL(ResourceLoaderOptions, mainResourceLoadOptions, |
1114 (SendCallbacks, SniffContent, BufferData, AllowStoredCredentials, AskCli
entForCrossOriginCredentials, SkipSecurityCheck)); | 1114 (SendCallbacks, SniffContent, BufferData, AllowStoredCredentials, AskCli
entForCrossOriginCredentials, SkipSecurityCheck, NonceCheckNotValid)); |
1115 CachedResourceRequest cachedResourceRequest(request, mainResourceLoadOptions
); | 1115 CachedResourceRequest cachedResourceRequest(request, mainResourceLoadOptions
); |
1116 m_mainResource = m_cachedResourceLoader->requestMainResource(cachedResourceR
equest); | 1116 m_mainResource = m_cachedResourceLoader->requestMainResource(cachedResourceR
equest); |
1117 if (!m_mainResource) { | 1117 if (!m_mainResource) { |
1118 setRequest(ResourceRequest()); | 1118 setRequest(ResourceRequest()); |
1119 // If the load was aborted by clearing m_request, it's possible the Appl
icationCacheHost | 1119 // If the load was aborted by clearing m_request, it's possible the Appl
icationCacheHost |
1120 // is now in a state where starting an empty load will be inconsistent.
Replace it with | 1120 // is now in a state where starting an empty load will be inconsistent.
Replace it with |
1121 // a new ApplicationCacheHost. | 1121 // a new ApplicationCacheHost. |
1122 m_applicationCacheHost = adoptPtr(new ApplicationCacheHost(this)); | 1122 m_applicationCacheHost = adoptPtr(new ApplicationCacheHost(this)); |
1123 maybeLoadEmpty(); | 1123 maybeLoadEmpty(); |
1124 return; | 1124 return; |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1173 commitLoad(resourceData->data(), resourceData->size()); | 1173 commitLoad(resourceData->data(), resourceData->size()); |
1174 } | 1174 } |
1175 | 1175 |
1176 void DocumentLoader::handledOnloadEvents() | 1176 void DocumentLoader::handledOnloadEvents() |
1177 { | 1177 { |
1178 m_wasOnloadHandled = true; | 1178 m_wasOnloadHandled = true; |
1179 applicationCacheHost()->stopDeferringEvents(); | 1179 applicationCacheHost()->stopDeferringEvents(); |
1180 } | 1180 } |
1181 | 1181 |
1182 } // namespace WebCore | 1182 } // namespace WebCore |
OLD | NEW |