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/renderer_host/resource_dispatcher_host_impl.h" | 7 #include "content/browser/renderer_host/resource_dispatcher_host_impl.h" |
8 | 8 |
9 #include <set> | 9 #include <set> |
10 #include <vector> | 10 #include <vector> |
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
120 #define NET_ERROR(label, value) -(value), | 120 #define NET_ERROR(label, value) -(value), |
121 #include "net/base/net_error_list.h" | 121 #include "net/base/net_error_list.h" |
122 #undef NET_ERROR | 122 #undef NET_ERROR |
123 }; | 123 }; |
124 | 124 |
125 // Aborts a request before an URLRequest has actually been created. | 125 // Aborts a request before an URLRequest has actually been created. |
126 void AbortRequestBeforeItStarts(ResourceMessageFilter* filter, | 126 void AbortRequestBeforeItStarts(ResourceMessageFilter* filter, |
127 IPC::Message* sync_result, | 127 IPC::Message* sync_result, |
128 int route_id, | 128 int route_id, |
129 int request_id) { | 129 int request_id) { |
130 net::URLRequestStatus status(net::URLRequestStatus::FAILED, | |
131 net::ERR_ABORTED); | |
132 if (sync_result) { | 130 if (sync_result) { |
133 SyncLoadResult result; | 131 SyncLoadResult result; |
134 result.status = status; | 132 result.error_code = net::ERR_ABORTED; |
135 ResourceHostMsg_SyncLoad::WriteReplyParams(sync_result, result); | 133 ResourceHostMsg_SyncLoad::WriteReplyParams(sync_result, result); |
136 filter->Send(sync_result); | 134 filter->Send(sync_result); |
137 } else { | 135 } else { |
138 // Tell the renderer that this request was disallowed. | 136 // Tell the renderer that this request was disallowed. |
139 filter->Send(new ResourceMsg_RequestComplete( | 137 filter->Send(new ResourceMsg_RequestComplete( |
140 route_id, | 138 route_id, |
141 request_id, | 139 request_id, |
142 status, | 140 net::ERR_ABORTED, |
| 141 false, |
143 std::string(), // No security info needed, connection not established. | 142 std::string(), // No security info needed, connection not established. |
144 base::TimeTicks())); | 143 base::TimeTicks())); |
145 } | 144 } |
146 } | 145 } |
147 | 146 |
148 GURL MaybeStripReferrer(const GURL& possible_referrer) { | 147 GURL MaybeStripReferrer(const GURL& possible_referrer) { |
149 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoReferrers)) | 148 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoReferrers)) |
150 return GURL(); | 149 return GURL(); |
151 return possible_referrer; | 150 return possible_referrer; |
152 } | 151 } |
(...skipping 1568 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1721 | 1720 |
1722 return i->second.get(); | 1721 return i->second.get(); |
1723 } | 1722 } |
1724 | 1723 |
1725 ResourceLoader* ResourceDispatcherHostImpl::GetLoader(int child_id, | 1724 ResourceLoader* ResourceDispatcherHostImpl::GetLoader(int child_id, |
1726 int request_id) const { | 1725 int request_id) const { |
1727 return GetLoader(GlobalRequestID(child_id, request_id)); | 1726 return GetLoader(GlobalRequestID(child_id, request_id)); |
1728 } | 1727 } |
1729 | 1728 |
1730 } // namespace content | 1729 } // namespace content |
OLD | NEW |