| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/navigation_request.h" | 5 #include "content/browser/frame_host/navigation_request.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
| 10 #include "content/browser/appcache/appcache_navigation_handle.h" | 10 #include "content/browser/appcache/appcache_navigation_handle.h" |
| (...skipping 565 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 576 // Don't ask the renderer to commit an URL if the browser will kill it when | 576 // Don't ask the renderer to commit an URL if the browser will kill it when |
| 577 // it does. | 577 // it does. |
| 578 DCHECK(render_frame_host->CanCommitURL(common_params_.url)); | 578 DCHECK(render_frame_host->CanCommitURL(common_params_.url)); |
| 579 | 579 |
| 580 NavigatorImpl::CheckWebUIRendererDoesNotDisplayNormalURL(render_frame_host, | 580 NavigatorImpl::CheckWebUIRendererDoesNotDisplayNormalURL(render_frame_host, |
| 581 common_params_.url); | 581 common_params_.url); |
| 582 | 582 |
| 583 TransferNavigationHandleOwnership(render_frame_host); | 583 TransferNavigationHandleOwnership(render_frame_host); |
| 584 render_frame_host->navigation_handle()->ReadyToCommitNavigation( | 584 render_frame_host->navigation_handle()->ReadyToCommitNavigation( |
| 585 render_frame_host); | 585 render_frame_host); |
| 586 render_frame_host->FailedNavigation(common_params_, request_params_, | 586 render_frame_host->FailedNavigation(common_params_, begin_params_, |
| 587 has_stale_copy_in_cache, net_error); | 587 request_params_, has_stale_copy_in_cache, |
| 588 net_error); |
| 588 } | 589 } |
| 589 | 590 |
| 590 void NavigationRequest::OnRequestStarted(base::TimeTicks timestamp) { | 591 void NavigationRequest::OnRequestStarted(base::TimeTicks timestamp) { |
| 591 if (frame_tree_node_->IsMainFrame()) { | 592 if (frame_tree_node_->IsMainFrame()) { |
| 592 TRACE_EVENT_ASYNC_END_WITH_TIMESTAMP0( | 593 TRACE_EVENT_ASYNC_END_WITH_TIMESTAMP0( |
| 593 "navigation", "Navigation timeToNetworkStack", navigation_handle_.get(), | 594 "navigation", "Navigation timeToNetworkStack", navigation_handle_.get(), |
| 594 timestamp); | 595 timestamp); |
| 595 } | 596 } |
| 596 | 597 |
| 597 frame_tree_node_->navigator()->LogResourceRequestTime(timestamp, | 598 frame_tree_node_->navigator()->LogResourceRequestTime(timestamp, |
| (...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 768 DCHECK_EQ(request_params_.has_user_gesture, begin_params_.has_user_gesture); | 769 DCHECK_EQ(request_params_.has_user_gesture, begin_params_.has_user_gesture); |
| 769 | 770 |
| 770 render_frame_host->CommitNavigation(response_.get(), std::move(body_), | 771 render_frame_host->CommitNavigation(response_.get(), std::move(body_), |
| 771 common_params_, request_params_, | 772 common_params_, request_params_, |
| 772 is_view_source_); | 773 is_view_source_); |
| 773 | 774 |
| 774 frame_tree_node_->ResetNavigationRequest(true); | 775 frame_tree_node_->ResetNavigationRequest(true); |
| 775 } | 776 } |
| 776 | 777 |
| 777 } // namespace content | 778 } // namespace content |
| OLD | NEW |