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 1057 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1068 | 1068 |
1069 if (m_substituteData.isValid()) { | 1069 if (m_substituteData.isValid()) { |
1070 m_identifierForLoadWithoutResourceLoader = createUniqueIdentifier(); | 1070 m_identifierForLoadWithoutResourceLoader = createUniqueIdentifier(); |
1071 frameLoader()->notifier()->dispatchWillSendRequest(this, m_identifierFor
LoadWithoutResourceLoader, m_request, ResourceResponse()); | 1071 frameLoader()->notifier()->dispatchWillSendRequest(this, m_identifierFor
LoadWithoutResourceLoader, m_request, ResourceResponse()); |
1072 handleSubstituteDataLoadSoon(); | 1072 handleSubstituteDataLoadSoon(); |
1073 return; | 1073 return; |
1074 } | 1074 } |
1075 | 1075 |
1076 ResourceRequest request(m_request); | 1076 ResourceRequest request(m_request); |
1077 DEFINE_STATIC_LOCAL(ResourceLoaderOptions, mainResourceLoadOptions, | 1077 DEFINE_STATIC_LOCAL(ResourceLoaderOptions, mainResourceLoadOptions, |
1078 (SendCallbacks, SniffContent, BufferData, AllowStoredCredentials, Client
RequestedCredentials, AskClientForCrossOriginCredentials, SkipSecurityCheck)); | 1078 (SendCallbacks, SniffContent, BufferData, AllowStoredCredentials, Client
RequestedCredentials, AskClientForCrossOriginCredentials, SkipSecurityCheck, Che
ckContentSecurityPolicy)); |
1079 CachedResourceRequest cachedResourceRequest(request, mainResourceLoadOptions
); | 1079 CachedResourceRequest cachedResourceRequest(request, mainResourceLoadOptions
); |
1080 m_mainResource = m_cachedResourceLoader->requestMainResource(cachedResourceR
equest); | 1080 m_mainResource = m_cachedResourceLoader->requestMainResource(cachedResourceR
equest); |
1081 if (!m_mainResource) { | 1081 if (!m_mainResource) { |
1082 setRequest(ResourceRequest()); | 1082 setRequest(ResourceRequest()); |
1083 // If the load was aborted by clearing m_request, it's possible the Appl
icationCacheHost | 1083 // If the load was aborted by clearing m_request, it's possible the Appl
icationCacheHost |
1084 // is now in a state where starting an empty load will be inconsistent.
Replace it with | 1084 // is now in a state where starting an empty load will be inconsistent.
Replace it with |
1085 // a new ApplicationCacheHost. | 1085 // a new ApplicationCacheHost. |
1086 m_applicationCacheHost = adoptPtr(new ApplicationCacheHost(this)); | 1086 m_applicationCacheHost = adoptPtr(new ApplicationCacheHost(this)); |
1087 maybeLoadEmpty(); | 1087 maybeLoadEmpty(); |
1088 return; | 1088 return; |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1136 commitLoad(resourceData->data(), resourceData->size()); | 1136 commitLoad(resourceData->data(), resourceData->size()); |
1137 } | 1137 } |
1138 | 1138 |
1139 void DocumentLoader::handledOnloadEvents() | 1139 void DocumentLoader::handledOnloadEvents() |
1140 { | 1140 { |
1141 m_wasOnloadHandled = true; | 1141 m_wasOnloadHandled = true; |
1142 applicationCacheHost()->stopDeferringEvents(); | 1142 applicationCacheHost()->stopDeferringEvents(); |
1143 } | 1143 } |
1144 | 1144 |
1145 } // namespace WebCore | 1145 } // namespace WebCore |
OLD | NEW |