| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/frame_host/render_frame_host_impl.h" | 5 #include "content/browser/frame_host/render_frame_host_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 2185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2196 TRACE_EVENT2("navigation", "RenderFrameHostImpl::OnBeginNavigation", | 2196 TRACE_EVENT2("navigation", "RenderFrameHostImpl::OnBeginNavigation", |
| 2197 "frame_tree_node", frame_tree_node_->frame_tree_node_id(), "url", | 2197 "frame_tree_node", frame_tree_node_->frame_tree_node_id(), "url", |
| 2198 common_params.url.possibly_invalid_spec()); | 2198 common_params.url.possibly_invalid_spec()); |
| 2199 | 2199 |
| 2200 CommonNavigationParams validated_params = common_params; | 2200 CommonNavigationParams validated_params = common_params; |
| 2201 GetProcess()->FilterURL(false, &validated_params.url); | 2201 GetProcess()->FilterURL(false, &validated_params.url); |
| 2202 if (!validated_params.base_url_for_data_url.is_empty()) { | 2202 if (!validated_params.base_url_for_data_url.is_empty()) { |
| 2203 // Kills the process. http://crbug.com/726142 | 2203 // Kills the process. http://crbug.com/726142 |
| 2204 bad_message::ReceivedBadMessage( | 2204 bad_message::ReceivedBadMessage( |
| 2205 GetProcess(), bad_message::RFH_BASE_URL_FOR_DATA_URL_SPECIFIED); | 2205 GetProcess(), bad_message::RFH_BASE_URL_FOR_DATA_URL_SPECIFIED); |
| 2206 return; |
| 2206 } | 2207 } |
| 2207 | 2208 |
| 2208 BeginNavigationParams validated_begin_params = begin_params; | 2209 BeginNavigationParams validated_begin_params = begin_params; |
| 2209 GetProcess()->FilterURL(true, &validated_begin_params.searchable_form_url); | 2210 GetProcess()->FilterURL(true, &validated_begin_params.searchable_form_url); |
| 2210 | 2211 |
| 2211 if (!ValidateUploadParams(validated_params)) { | 2212 if (!ValidateUploadParams(validated_params)) { |
| 2212 bad_message::ReceivedBadMessage(GetProcess(), | 2213 bad_message::ReceivedBadMessage(GetProcess(), |
| 2213 bad_message::RFH_ILLEGAL_UPLOAD_PARAMS); | 2214 bad_message::RFH_ILLEGAL_UPLOAD_PARAMS); |
| 2214 return; | 2215 return; |
| 2215 } | 2216 } |
| (...skipping 1878 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4094 } | 4095 } |
| 4095 | 4096 |
| 4096 void RenderFrameHostImpl::ForwardGetInterfaceToRenderFrame( | 4097 void RenderFrameHostImpl::ForwardGetInterfaceToRenderFrame( |
| 4097 const std::string& interface_name, | 4098 const std::string& interface_name, |
| 4098 mojo::ScopedMessagePipeHandle pipe) { | 4099 mojo::ScopedMessagePipeHandle pipe) { |
| 4099 GetRemoteInterfaces()->GetInterface(interface_name, std::move(pipe)); | 4100 GetRemoteInterfaces()->GetInterface(interface_name, std::move(pipe)); |
| 4100 } | 4101 } |
| 4101 #endif | 4102 #endif |
| 4102 | 4103 |
| 4103 } // namespace content | 4104 } // namespace content |
| OLD | NEW |