| commit | a2dd6a4a07e87b1f57e14b85c27e4766cad7b714 | [log] [tgz] |
|---|---|---|
| author | Miyoung Shin <[email protected]> | Thu Oct 07 12:19:21 2021 |
| committer | Chromium LUCI CQ <[email protected]> | Thu Oct 07 12:19:21 2021 |
| tree | b28d88219e64369d9f8d15db75d812b2bb0705ba | |
| parent | 397401861e1ecb3aabf9f776ab874d12c431d50a [diff] [blame] |
Reland "[mparch] Expose IsErrorDocument in RenderFrameHost" This is a reland of dd5f48e2f2473d26068f6b4b48c69b28140f5293 Reason for revert: fixed the flaky TC. Original change's description: > [mparch] Expose IsErrorDocument in RenderFrameHost > > This is a precursor CL of crrev.com/c/3189357 that will replace > DidFinishNavigation with PrimaryPageChanged. To match > NavigationHandle::IsErrorPage, this CL exposes IsErrorDocument in > RenderFrameHost. > > Bug: 1218946 > Change-Id: I52332b9b3b7ec4fb4fcb5733b7a9ea0780a40a51 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3193931 > Commit-Queue: Miyoung Shin <[email protected]> > Reviewed-by: Alexander Timin <[email protected]> > Reviewed-by: Alex Moshchuk <[email protected]> > Cr-Commit-Position: refs/heads/main@{#926656} Bug: 1218946, 1254825 Change-Id: I43136515238e7c2c2c6fbb68fdce96350d7ec86c Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3198011 Reviewed-by: Alexander Timin <[email protected]> Reviewed-by: Alex Moshchuk <[email protected]> Commit-Queue: Miyoung Shin <[email protected]> Cr-Commit-Position: refs/heads/main@{#929145}
diff --git a/content/browser/renderer_host/navigation_controller_impl.cc b/content/browser/renderer_host/navigation_controller_impl.cc index 7b76c14..0c9182d 100644 --- a/content/browser/renderer_host/navigation_controller_impl.cc +++ b/content/browser/renderer_host/navigation_controller_impl.cc
@@ -3505,7 +3505,7 @@ // current URL by the time this navigation commits. bool has_pending_cross_document_commit = node->render_manager()->HasPendingCommitForCrossDocumentNavigation(); - bool is_currently_error_page = node->current_frame_host()->is_error_page(); + bool is_currently_error_page = node->current_frame_host()->IsErrorDocument(); blink::mojom::NavigationType navigation_type = GetNavigationType( /*old_url=*/node->current_url(), @@ -3684,7 +3684,7 @@ frame_tree_node->render_manager() ->HasPendingCommitForCrossDocumentNavigation(); bool is_currently_error_page = - frame_tree_node->current_frame_host()->is_error_page(); + frame_tree_node->current_frame_host()->IsErrorDocument(); blink::mojom::NavigationType navigation_type = GetNavigationType( /*old_url=*/frame_tree_node->current_url(),