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

Side by Side Diff: content/browser/loader/resource_dispatcher_host_impl.cc

Issue 1566713004: Fix a null AppCacheBackendImpl ptr crash in CompleteCrossSiteTransfer and re… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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
« no previous file with comments | « content/browser/bad_message.h ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 // See http://dev.chromium.org/developers/design-documents/multi-process-resourc e-loading 5 // See http://dev.chromium.org/developers/design-documents/multi-process-resourc e-loading
6 6
7 #include "content/browser/loader/resource_dispatcher_host_impl.h" 7 #include "content/browser/loader/resource_dispatcher_host_impl.h"
8 8
9 #include <stddef.h> 9 #include <stddef.h>
10 #include <algorithm> 10 #include <algorithm>
(...skipping 1215 matching lines...) Expand 10 before | Expand all | Expand 10 after
1226 } 1226 }
1227 // Now store the observer list under the new request ID. 1227 // Now store the observer list under the new request ID.
1228 delegate_map_[new_request_id] = delegate_map_[old_request_id]; 1228 delegate_map_[new_request_id] = delegate_map_[old_request_id];
1229 delegate_map_.erase(old_request_id); 1229 delegate_map_.erase(old_request_id);
1230 } 1230 }
1231 } 1231 }
1232 1232
1233 AppCacheInterceptor::CompleteCrossSiteTransfer( 1233 AppCacheInterceptor::CompleteCrossSiteTransfer(
1234 loader->request(), 1234 loader->request(),
1235 child_id, 1235 child_id,
1236 request_data.appcache_host_id); 1236 request_data.appcache_host_id,
1237 filter_);
1237 1238
1238 ServiceWorkerRequestHandler* handler = 1239 ServiceWorkerRequestHandler* handler =
1239 ServiceWorkerRequestHandler::GetHandler(loader->request()); 1240 ServiceWorkerRequestHandler::GetHandler(loader->request());
1240 if (handler) { 1241 if (handler) {
1241 handler->CompleteCrossSiteTransfer( 1242 handler->CompleteCrossSiteTransfer(
1242 child_id, request_data.service_worker_provider_id); 1243 child_id, request_data.service_worker_provider_id);
1243 } 1244 }
1244 1245
1245 // We should have a CrossSiteResourceHandler to finish the transfer. 1246 // We should have a CrossSiteResourceHandler to finish the transfer.
1246 DCHECK(info->cross_site_handler()); 1247 DCHECK(info->cross_site_handler());
(...skipping 1304 matching lines...) Expand 10 before | Expand all | Expand 10 after
2551 load_flags |= net::LOAD_PREFETCH; 2552 load_flags |= net::LOAD_PREFETCH;
2552 } 2553 }
2553 2554
2554 if (is_sync_load) 2555 if (is_sync_load)
2555 load_flags |= net::LOAD_IGNORE_LIMITS; 2556 load_flags |= net::LOAD_IGNORE_LIMITS;
2556 2557
2557 return load_flags; 2558 return load_flags;
2558 } 2559 }
2559 2560
2560 } // namespace content 2561 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/bad_message.h ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698