Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(360)

Unified Diff: trunk/src/content/browser/frame_host/frame_tree.cc

Issue 163703004: Revert 250823 "With --site-per-process, avoid a crash when a sub..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/content/browser/frame_host/frame_tree.cc
===================================================================
--- trunk/src/content/browser/frame_host/frame_tree.cc (revision 251088)
+++ trunk/src/content/browser/frame_host/frame_tree.cc (working copy)
@@ -43,15 +43,6 @@
return true;
}
-// Iterate over the FrameTree to reset any node affected by the loss of the
-// given RenderViewHost's process.
-bool ResetNodesForNewProcess(RenderViewHost* render_view_host,
- FrameTreeNode* node) {
- if (render_view_host == node->current_frame_host()->render_view_host())
- node->ResetForNewProcess();
- return true;
-}
-
} // namespace
FrameTree::FrameTree(Navigator* navigator,
@@ -162,19 +153,9 @@
}
void FrameTree::ResetForMainFrameSwap() {
- root_->ResetForNewProcess();
+ return root_->ResetForMainFrameSwap();
}
-void FrameTree::RenderProcessGone(RenderViewHost* render_view_host) {
- // Walk the full tree looking for nodes that may be affected. Once a frame
- // crashes, all of its child FrameTreeNodes go away.
- // Note that the helper function may call ResetForNewProcess on a node, which
- // clears its children before we iterate over them. That's ok, because
- // ForEach does not add a node's children to the queue until after visiting
- // the node itself.
- ForEach(base::Bind(&ResetNodesForNewProcess, render_view_host));
-}
-
RenderFrameHostImpl* FrameTree::GetMainFrame() const {
return root_->current_frame_host();
}
« no previous file with comments | « trunk/src/content/browser/frame_host/frame_tree.h ('k') | trunk/src/content/browser/frame_host/frame_tree_node.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698