| commit | f352e309013176efad0ba3ceadec476ef96b339e | [log] [tgz] |
|---|---|---|
| author | Sreeja Kamishetty <[email protected]> | Wed Jun 10 13:21:24 2020 |
| committer | Commit Bot <[email protected]> | Wed Jun 10 13:21:24 2020 |
| tree | 8b941c011d263b55610d7be08ff7d01cfc390c5a | |
| parent | 45a0c323a2adc6e503f6bfae12d479dba13e9816 [diff] [blame] |
[content] Remove RenderFrameHostImpl::is_active RenderFrameHostImpl::is_active is used either when the RFH is in pending deletion or in back forward cache. We would like to remove all the |is_active| occurrences to avoid confusion with all the other methods and use specific methods like: - RenderFrameHost::IsCurrent() - RenderFrameHostImpl::IsPendingDeletion() - RenderFrameHostImpl::IsInBackForwardCache() - RenderFrameHostImpl::IsInActiveAndDisallowReactivation() This patch updates the callers of |is_active| and make use of above mentioned methods along with removing RenderFrameHostImpl::is_active(). Detailed list of investigations for each is_active usage is presented in this spreadsheet: https://docs.google.com/spreadsheets/d/1TTzZ5r0m7nHBS_TkrEAdcFGs0M2iXO_tS0-lJmbQ3EY/edit?usp=sharing BUG=1073449 Change-Id: I3be34f9ac66389edb36f53a73fc806f2d9d942a6 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2186641 Commit-Queue: Sreeja Kamishetty <[email protected]> Reviewed-by: Arthur Sonzogni <[email protected]> Reviewed-by: Alex Moshchuk <[email protected]> Reviewed-by: Alexander Timin <[email protected]> Cr-Commit-Position: refs/heads/master@{#776924}
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc index ff6f930..77f4422 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc
@@ -5603,7 +5603,7 @@ javascript_dialog_navigation_deferrer_ = std::make_unique<JavaScriptDialogNavigationDeferrer>(); - bool should_suppress = !rfhi->is_active() || + bool should_suppress = !rfhi->IsCurrent() || (delegate_ && delegate_->ShouldSuppressDialogs(this)); bool has_non_devtools_handlers = delegate_ && dialog_manager_; bool has_handlers = page_handlers.size() || has_non_devtools_handlers;