| OLD | NEW |
| 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 <set> | 9 #include <set> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 1379 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1390 ResourceRequestInfoImpl* info = iter->second->GetRequestInfo(); | 1390 ResourceRequestInfoImpl* info = iter->second->GetRequestInfo(); |
| 1391 | 1391 |
| 1392 // Remove the memory credit that we added when pushing the request onto | 1392 // Remove the memory credit that we added when pushing the request onto |
| 1393 // the pending list. | 1393 // the pending list. |
| 1394 IncrementOutstandingRequestsMemoryCost(-1 * info->memory_cost(), | 1394 IncrementOutstandingRequestsMemoryCost(-1 * info->memory_cost(), |
| 1395 info->GetChildID()); | 1395 info->GetChildID()); |
| 1396 | 1396 |
| 1397 pending_loaders_.erase(iter); | 1397 pending_loaders_.erase(iter); |
| 1398 | 1398 |
| 1399 // If we have no more pending requests, then stop the load state monitor | 1399 // If we have no more pending requests, then stop the load state monitor |
| 1400 if (pending_loaders_.empty() && update_load_states_timer_.get()) | 1400 if (pending_loaders_.empty() && update_load_states_timer_) |
| 1401 update_load_states_timer_->Stop(); | 1401 update_load_states_timer_->Stop(); |
| 1402 } | 1402 } |
| 1403 | 1403 |
| 1404 void ResourceDispatcherHostImpl::CancelRequest(int child_id, | 1404 void ResourceDispatcherHostImpl::CancelRequest(int child_id, |
| 1405 int request_id, | 1405 int request_id, |
| 1406 bool from_renderer) { | 1406 bool from_renderer) { |
| 1407 if (from_renderer) { | 1407 if (from_renderer) { |
| 1408 // When the old renderer dies, it sends a message to us to cancel its | 1408 // When the old renderer dies, it sends a message to us to cancel its |
| 1409 // requests. | 1409 // requests. |
| 1410 if (IsTransferredNavigation(GlobalRequestID(child_id, request_id))) | 1410 if (IsTransferredNavigation(GlobalRequestID(child_id, request_id))) |
| (...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1756 DelegateMap::iterator it = delegate_map_.find(id); | 1756 DelegateMap::iterator it = delegate_map_.find(id); |
| 1757 DCHECK(it->second->HasObserver(delegate)); | 1757 DCHECK(it->second->HasObserver(delegate)); |
| 1758 it->second->RemoveObserver(delegate); | 1758 it->second->RemoveObserver(delegate); |
| 1759 if (it->second->size() == 0) { | 1759 if (it->second->size() == 0) { |
| 1760 delete it->second; | 1760 delete it->second; |
| 1761 delegate_map_.erase(it); | 1761 delegate_map_.erase(it); |
| 1762 } | 1762 } |
| 1763 } | 1763 } |
| 1764 | 1764 |
| 1765 } // namespace content | 1765 } // namespace content |
| OLD | NEW |