| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "webkit/appcache/appcache_request_handler.h" | 5 #include "webkit/appcache/appcache_request_handler.h" |
| 6 | 6 |
| 7 #include "net/url_request/url_request.h" | 7 #include "net/url_request/url_request.h" |
| 8 #include "net/url_request/url_request_job.h" | 8 #include "net/url_request/url_request_job.h" |
| 9 #include "webkit/appcache/appcache.h" | 9 #include "webkit/appcache/appcache.h" |
| 10 #include "webkit/appcache/appcache_policy.h" | 10 #include "webkit/appcache/appcache_policy.h" |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 return job_; | 119 return job_; |
| 120 } | 120 } |
| 121 | 121 |
| 122 AppCacheURLRequestJob* AppCacheRequestHandler::MaybeLoadFallbackForResponse( | 122 AppCacheURLRequestJob* AppCacheRequestHandler::MaybeLoadFallbackForResponse( |
| 123 net::URLRequest* request, net::NetworkDelegate* network_delegate) { | 123 net::URLRequest* request, net::NetworkDelegate* network_delegate) { |
| 124 if (!host_ || !IsSchemeAndMethodSupported(request) || cache_entry_not_found_) | 124 if (!host_ || !IsSchemeAndMethodSupported(request) || cache_entry_not_found_) |
| 125 return NULL; | 125 return NULL; |
| 126 if (!found_fallback_entry_.has_response_id()) | 126 if (!found_fallback_entry_.has_response_id()) |
| 127 return NULL; | 127 return NULL; |
| 128 | 128 |
| 129 if (request->status().status() == net::URLRequestStatus::CANCELED || | 129 if (request->status().status() == net::URLRequestStatus::CANCELED) { |
| 130 request->status().status() == net::URLRequestStatus::HANDLED_EXTERNALLY) { | |
| 131 // 6.9.6, step 4: But not if the user canceled the download. | 130 // 6.9.6, step 4: But not if the user canceled the download. |
| 132 return NULL; | 131 return NULL; |
| 133 } | 132 } |
| 134 | 133 |
| 135 // We don't fallback for responses that we delivered. | 134 // We don't fallback for responses that we delivered. |
| 136 if (job_) { | 135 if (job_) { |
| 137 DCHECK(!job_->is_delivering_network_response()); | 136 DCHECK(!job_->is_delivering_network_response()); |
| 138 return NULL; | 137 return NULL; |
| 139 } | 138 } |
| 140 | 139 |
| (...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 362 if (!host_->associated_cache() || | 361 if (!host_->associated_cache() || |
| 363 !host_->associated_cache()->is_complete()) { | 362 !host_->associated_cache()->is_complete()) { |
| 364 DeliverNetworkResponse(); | 363 DeliverNetworkResponse(); |
| 365 return; | 364 return; |
| 366 } | 365 } |
| 367 | 366 |
| 368 ContinueMaybeLoadSubResource(); | 367 ContinueMaybeLoadSubResource(); |
| 369 } | 368 } |
| 370 | 369 |
| 371 } // namespace appcache | 370 } // namespace appcache |
| OLD | NEW |