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 #include "content/browser/renderer_host/sync_resource_handler.h" | 5 #include "content/browser/renderer_host/sync_resource_handler.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "content/browser/debugger/devtools_netlog_observer.h" | 8 #include "content/browser/debugger/devtools_netlog_observer.h" |
9 #include "content/browser/renderer_host/resource_dispatcher_host_impl.h" | 9 #include "content/browser/renderer_host/resource_dispatcher_host_impl.h" |
10 #include "content/browser/renderer_host/resource_message_filter.h" | 10 #include "content/browser/renderer_host/resource_message_filter.h" |
(...skipping 30 matching lines...) Expand all Loading... |
41 uint64 size) { | 41 uint64 size) { |
42 return true; | 42 return true; |
43 } | 43 } |
44 | 44 |
45 bool SyncResourceHandler::OnRequestRedirected( | 45 bool SyncResourceHandler::OnRequestRedirected( |
46 int request_id, | 46 int request_id, |
47 const GURL& new_url, | 47 const GURL& new_url, |
48 ResourceResponse* response, | 48 ResourceResponse* response, |
49 bool* defer) { | 49 bool* defer) { |
50 if (rdh_->delegate()) { | 50 if (rdh_->delegate()) { |
51 rdh_->delegate()->OnRequestRedirected(request_, filter_->resource_context(), | 51 rdh_->delegate()->OnRequestRedirected(new_url, request_, |
| 52 filter_->resource_context(), |
52 response); | 53 response); |
53 } | 54 } |
54 | 55 |
55 DevToolsNetLogObserver::PopulateResponseInfo(request_, response); | 56 DevToolsNetLogObserver::PopulateResponseInfo(request_, response); |
56 // TODO(darin): It would be much better if this could live in WebCore, but | 57 // TODO(darin): It would be much better if this could live in WebCore, but |
57 // doing so requires API changes at all levels. Similar code exists in | 58 // doing so requires API changes at all levels. Similar code exists in |
58 // WebCore/platform/network/cf/ResourceHandleCFNet.cpp :-( | 59 // WebCore/platform/network/cf/ResourceHandleCFNet.cpp :-( |
59 if (new_url.GetOrigin() != result_.final_url.GetOrigin()) { | 60 if (new_url.GetOrigin() != result_.final_url.GetOrigin()) { |
60 LOG(ERROR) << "Cross origin redirect denied"; | 61 LOG(ERROR) << "Cross origin redirect denied"; |
61 return false; | 62 return false; |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
120 result_.encoded_data_length = | 121 result_.encoded_data_length = |
121 DevToolsNetLogObserver::GetAndResetEncodedDataLength(request_); | 122 DevToolsNetLogObserver::GetAndResetEncodedDataLength(request_); |
122 | 123 |
123 ResourceHostMsg_SyncLoad::WriteReplyParams(result_message_, result_); | 124 ResourceHostMsg_SyncLoad::WriteReplyParams(result_message_, result_); |
124 filter_->Send(result_message_); | 125 filter_->Send(result_message_); |
125 result_message_ = NULL; | 126 result_message_ = NULL; |
126 return true; | 127 return true; |
127 } | 128 } |
128 | 129 |
129 } // namespace content | 130 } // namespace content |
OLD | NEW |