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

Unified Diff: content/browser/frame_host/render_frame_host_manager.cc

Issue 1635873003: Replicating WebFrame::uniqueName across renderers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dump-render-tree3
Patch Set: Fixing fallout from the new assert in FrameTree.cpp. Created 4 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: content/browser/frame_host/render_frame_host_manager.cc
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
index cd1684b769a1b7479a79e30536bf586b6eafeec9..c740b2496e4a727532964b2ae9c84d9ee61491e8 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -937,7 +937,8 @@ void RenderFrameHostManager::OnDidStopLoading() {
}
}
-void RenderFrameHostManager::OnDidUpdateName(const std::string& name) {
+void RenderFrameHostManager::OnDidUpdateName(const std::string& name,
+ const std::string& unique_name) {
// The window.name message may be sent outside of --site-per-process when
// report_frame_name_changes renderer preference is set (used by
// WebView). Don't send the update to proxies in those cases.
@@ -947,8 +948,8 @@ void RenderFrameHostManager::OnDidUpdateName(const std::string& name) {
return;
for (const auto& pair : proxy_hosts_) {
- pair.second->Send(
- new FrameMsg_DidUpdateName(pair.second->GetRoutingID(), name));
+ pair.second->Send(new FrameMsg_DidUpdateName(pair.second->GetRoutingID(),
+ name, unique_name));
}
}
@@ -1798,7 +1799,8 @@ void RenderFrameHostManager::CreateOuterDelegateProxy(
// investigate and fix.
render_frame_host->Send(new FrameMsg_SwapOut(
render_frame_host->GetRoutingID(), proxy->GetRoutingID(),
- false /* is_loading */, FrameReplicationState()));
+ false /* is_loading */,
+ render_frame_host->frame_tree_node()->current_replication_state()));
Charlie Reis 2016/02/11 22:02:14 Yes, this looks reasonable to me. I can't think o
Łukasz Anforowicz 2016/02/11 23:23:56 Acknowledged.
proxy->set_render_frame_proxy_created(true);
}

Powered by Google App Engine
This is Rietveld 408576698