Merge cleanup loop across FrameTreeNodes in ~WebContentsImpl.
BUG=none
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation
Review URL: https://codereview.chromium.org/1605303002
Cr-Commit-Position: refs/heads/master@{#370615}
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 06fd27cb..1d19e40 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -413,13 +413,12 @@
rwh_input_event_router_.reset();
- // Delete all RFH pending shutdown, which will lead the corresponding RVH to
- // shutdown and be deleted as well.
- for (FrameTreeNode* node : frame_tree_.Nodes())
+ for (FrameTreeNode* node : frame_tree_.Nodes()) {
+ // Delete all RFHs pending shutdown, which will lead the corresponding RVHs
+ // to be shutdown and be deleted as well.
node->render_manager()->ClearRFHsPendingShutdown();
-
- for (FrameTreeNode* node : frame_tree_.Nodes())
node->render_manager()->ClearWebUIInstances();
+ }
for (RenderWidgetHostImpl* widget : created_widgets_)
widget->DetachDelegate();
