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 592 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
603 // WebUI backend won't find a handler for them. They will be processed in the | 603 // WebUI backend won't find a handler for them. They will be processed in the |
604 // renderer, however do not discard the pending entry so that the URL bar | 604 // renderer, however do not discard the pending entry so that the URL bar |
605 // shows them correctly. | 605 // shows them correctly. |
606 if (!IsRendererDebugURL(common_params_.url)) { | 606 if (!IsRendererDebugURL(common_params_.url)) { |
607 frame_tree_node_->navigator()->DiscardPendingEntryIfNeeded( | 607 frame_tree_node_->navigator()->DiscardPendingEntryIfNeeded( |
608 navigation_handle_.get()); | 608 navigation_handle_.get()); |
609 } | 609 } |
610 | 610 |
611 // If the request was canceled by the user do not show an error page. | 611 // If the request was canceled by the user do not show an error page. |
612 if (net_error == net::ERR_ABORTED) { | 612 if (net_error == net::ERR_ABORTED) { |
613 // TODO(clamy): Remove this once we understand the root cause of | |
614 // crbug.com/709771. | |
615 if (common_params_.url.spec().find(".pdf") != std::string::npos) | |
nasko
2017/04/17 21:30:05
Shouldn't this be searching only at the end of the
clamy
2017/04/18 15:29:55
Done.
| |
616 base::debug::DumpWithoutCrashing(); | |
617 | |
613 frame_tree_node_->ResetNavigationRequest(false, true); | 618 frame_tree_node_->ResetNavigationRequest(false, true); |
614 return; | 619 return; |
615 } | 620 } |
616 | 621 |
617 // There are two types of error pages that need to be handled differently. | 622 // There are two types of error pages that need to be handled differently. |
618 // * Error pages resulting from blocking the request, because the original | 623 // * Error pages resulting from blocking the request, because the original |
619 // document wasn't even allowed to make the request. In such case, | 624 // document wasn't even allowed to make the request. In such case, |
620 // the error pages should be committed in the process of the original | 625 // the error pages should be committed in the process of the original |
621 // document, to avoid creating a process for the destination. | 626 // document, to avoid creating a process for the destination. |
622 // * Error pages resulting from either network outage (no network, DNS | 627 // * Error pages resulting from either network outage (no network, DNS |
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
842 DCHECK_EQ(request_params_.has_user_gesture, begin_params_.has_user_gesture); | 847 DCHECK_EQ(request_params_.has_user_gesture, begin_params_.has_user_gesture); |
843 | 848 |
844 render_frame_host->CommitNavigation(response_.get(), std::move(body_), | 849 render_frame_host->CommitNavigation(response_.get(), std::move(body_), |
845 std::move(handle_), common_params_, | 850 std::move(handle_), common_params_, |
846 request_params_, is_view_source_); | 851 request_params_, is_view_source_); |
847 | 852 |
848 frame_tree_node_->ResetNavigationRequest(true, true); | 853 frame_tree_node_->ResetNavigationRequest(true, true); |
849 } | 854 } |
850 | 855 |
851 } // namespace content | 856 } // namespace content |
OLD | NEW |