Chromium Code Reviews| 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 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 192 case Resource::ImportResource: | 192 case Resource::ImportResource: |
| 193 resource = RawResource::fetchImport(request, fetcher()); | 193 resource = RawResource::fetchImport(request, fetcher()); |
| 194 break; | 194 break; |
| 195 case Resource::Raw: | 195 case Resource::Raw: |
| 196 resource = RawResource::fetch(request, fetcher()); | 196 resource = RawResource::fetch(request, fetcher()); |
| 197 break; | 197 break; |
| 198 default: | 198 default: |
| 199 NOTREACHED(); | 199 NOTREACHED(); |
| 200 } | 200 } |
| 201 | 201 |
| 202 if (resource) | 202 if (resource && !resource->resourceError().isAccessCheck()) |
|
Nate Chapin
2016/09/22 18:30:44
Here and in XMLHttpRequest.cpp, we should probably
engedy
2016/09/30 16:03:15
Done. Please let me know if the information I put
| |
| 203 fetcher()->preloadStarted(resource); | 203 fetcher()->preloadStarted(resource); |
| 204 return resource; | 204 return resource; |
| 205 } | 205 } |
| 206 | 206 |
| 207 void DocumentLoader::didRedirect(const KURL& oldURL, const KURL& newURL) | 207 void DocumentLoader::didRedirect(const KURL& oldURL, const KURL& newURL) |
| 208 { | 208 { |
| 209 timing().addRedirect(oldURL, newURL); | 209 timing().addRedirect(oldURL, newURL); |
| 210 | 210 |
| 211 // If a redirection happens during a back/forward navigation, don't restore | 211 // If a redirection happens during a back/forward navigation, don't restore |
| 212 // any state from the old HistoryItem. | 212 // any state from the old HistoryItem. |
| (...skipping 507 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 720 { | 720 { |
| 721 m_writer = createWriterFor(init, mimeType(), m_writer ? m_writer->encoding() : emptyAtom, true, ForceSynchronousParsing); | 721 m_writer = createWriterFor(init, mimeType(), m_writer ? m_writer->encoding() : emptyAtom, true, ForceSynchronousParsing); |
| 722 if (!source.isNull()) | 722 if (!source.isNull()) |
| 723 m_writer->appendReplacingData(source); | 723 m_writer->appendReplacingData(source); |
| 724 endWriting(m_writer.get()); | 724 endWriting(m_writer.get()); |
| 725 } | 725 } |
| 726 | 726 |
| 727 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader); | 727 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader); |
| 728 | 728 |
| 729 } // namespace blink | 729 } // namespace blink |
| OLD | NEW |