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

Unified Diff: content/renderer/render_thread_impl.cc

Issue 600553003: Enable swapping a frame back in to its parent process (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remoteToLocal
Patch Set: Created 6 years, 2 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
« no previous file with comments | « content/renderer/render_thread_impl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_thread_impl.cc
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 7677ac58692a1cea119687e28f778c2ee8484364..a24c6b4fc48137fee7d8e5379dfc90b06bcffdf6 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -1300,8 +1300,10 @@ bool RenderThreadImpl::OnControlMessageReceived(const IPC::Message& msg) {
return handled;
}
-void RenderThreadImpl::OnCreateNewFrame(int routing_id, int parent_routing_id) {
- RenderFrameImpl::CreateFrame(routing_id, parent_routing_id);
+void RenderThreadImpl::OnCreateNewFrame(int routing_id,
+ int parent_routing_id,
+ int proxy_routing_id) {
+ RenderFrameImpl::CreateFrame(routing_id, parent_routing_id, proxy_routing_id);
}
void RenderThreadImpl::OnCreateNewFrameProxy(int routing_id,
« no previous file with comments | « content/renderer/render_thread_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698