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 <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 1165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1176 return std::move(navigation_handle_); | 1176 return std::move(navigation_handle_); |
1177 } | 1177 } |
1178 | 1178 |
1179 void RenderFrameHostImpl::OnCrossSiteResponse( | 1179 void RenderFrameHostImpl::OnCrossSiteResponse( |
1180 const GlobalRequestID& global_request_id, | 1180 const GlobalRequestID& global_request_id, |
1181 std::unique_ptr<CrossSiteTransferringRequest> | 1181 std::unique_ptr<CrossSiteTransferringRequest> |
1182 cross_site_transferring_request, | 1182 cross_site_transferring_request, |
1183 const std::vector<GURL>& transfer_url_chain, | 1183 const std::vector<GURL>& transfer_url_chain, |
1184 const Referrer& referrer, | 1184 const Referrer& referrer, |
1185 ui::PageTransition page_transition, | 1185 ui::PageTransition page_transition, |
1186 bool should_replace_current_entry) { | 1186 bool should_replace_current_entry, |
| 1187 const scoped_refptr<ResourceRequestBody>& resource_request_body) { |
1187 frame_tree_node_->render_manager()->OnCrossSiteResponse( | 1188 frame_tree_node_->render_manager()->OnCrossSiteResponse( |
1188 this, global_request_id, std::move(cross_site_transferring_request), | 1189 this, global_request_id, std::move(cross_site_transferring_request), |
1189 transfer_url_chain, referrer, page_transition, | 1190 transfer_url_chain, referrer, page_transition, |
1190 should_replace_current_entry); | 1191 should_replace_current_entry, resource_request_body); |
1191 } | 1192 } |
1192 | 1193 |
1193 void RenderFrameHostImpl::SwapOut( | 1194 void RenderFrameHostImpl::SwapOut( |
1194 RenderFrameProxyHost* proxy, | 1195 RenderFrameProxyHost* proxy, |
1195 bool is_loading) { | 1196 bool is_loading) { |
1196 // The end of this event is in OnSwapOutACK when the RenderFrame has completed | 1197 // The end of this event is in OnSwapOutACK when the RenderFrame has completed |
1197 // the operation and sends back an IPC message. | 1198 // the operation and sends back an IPC message. |
1198 // The trace event may not end properly if the ACK times out. We expect this | 1199 // The trace event may not end properly if the ACK times out. We expect this |
1199 // to be fixed when RenderViewHostImpl::OnSwapOut moves to RenderFrameHost. | 1200 // to be fixed when RenderViewHostImpl::OnSwapOut moves to RenderFrameHost. |
1200 TRACE_EVENT_ASYNC_BEGIN0("navigation", "RenderFrameHostImpl::SwapOut", this); | 1201 TRACE_EVENT_ASYNC_BEGIN0("navigation", "RenderFrameHostImpl::SwapOut", this); |
(...skipping 1563 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2764 // handler after it's destroyed so it can't run after the RFHI is destroyed. | 2765 // handler after it's destroyed so it can't run after the RFHI is destroyed. |
2765 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( | 2766 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( |
2766 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); | 2767 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); |
2767 } | 2768 } |
2768 | 2769 |
2769 void RenderFrameHostImpl::DeleteWebBluetoothService() { | 2770 void RenderFrameHostImpl::DeleteWebBluetoothService() { |
2770 web_bluetooth_service_.reset(); | 2771 web_bluetooth_service_.reset(); |
2771 } | 2772 } |
2772 | 2773 |
2773 } // namespace content | 2774 } // namespace content |
OLD | NEW |