| commit | c8c1855ecc4979d88c6c50d199dd9975b10d354e | [log] [tgz] |
|---|---|---|
| author | Yu Gao <[email protected]> | Wed Jun 22 14:38:45 2022 |
| committer | Chromium LUCI CQ <[email protected]> | Wed Jun 22 14:38:45 2022 |
| tree | ba5c5fe47740929c21af9f8fbb9e50e86757fa79 | |
| parent | 39663321a0d3e155103ff49d708a1a5c6842b290 [diff] [blame] |
Rename FrameTree::IsLoading To capture the new behaviour where the value of FrameTree::IsLoading is equal to the effective value of all its inner frame trees as well we rename IsLoading to IsLoadingIncludingInnerFrameTrees. Bug: 1293846 Change-Id: I4b7751b72556e1224729caf0e7d7a00122464d0d Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3713165 Reviewed-by: Sreeja Kamishetty <[email protected]> Reviewed-by: Bo Liu <[email protected]> Commit-Queue: Bo Liu <[email protected]> Reviewed-by: Lingqi Chi <[email protected]> Cr-Commit-Position: refs/heads/main@{#1016713}
diff --git a/content/browser/renderer_host/navigation_controller_impl.cc b/content/browser/renderer_host/navigation_controller_impl.cc index 722942ea..382b56b 100644 --- a/content/browser/renderer_host/navigation_controller_impl.cc +++ b/content/browser/renderer_host/navigation_controller_impl.cc
@@ -4326,7 +4326,7 @@ // We may have left a failed browser-initiated navigation in the address bar // to let the user edit it and try again. Clear it now that content might // show up underneath it. - if (!frame_tree_.IsLoading() && GetPendingEntry()) + if (!frame_tree_.IsLoadingIncludingInnerFrameTrees() && GetPendingEntry()) DiscardPendingEntry(false); // Update the URL display.