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