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

Unified Diff: content/renderer/render_frame_proxy.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/renderer/render_frame_proxy.cc
diff --git a/content/renderer/render_frame_proxy.cc b/content/renderer/render_frame_proxy.cc
index 3c4df02b62b95ae52e10de90cafec1a5754f7e06..d64e50e871df6cc9e896a0736554e413b40a8ebc 100644
--- a/content/renderer/render_frame_proxy.cc
+++ b/content/renderer/render_frame_proxy.cc
@@ -100,6 +100,7 @@ RenderFrameProxy* RenderFrameProxy::CreateFrameProxy(
web_frame = parent->web_frame()->createRemoteChild(
replicated_state.scope,
blink::WebString::fromUTF8(replicated_state.name),
+ blink::WebString::fromUTF8(replicated_state.unique_name),
replicated_state.sandbox_flags, proxy.get());
render_view = parent->render_view();
render_widget = parent->render_widget();
@@ -213,7 +214,8 @@ void RenderFrameProxy::SetReplicatedState(const FrameReplicationState& state) {
DCHECK(web_frame_);
web_frame_->setReplicatedOrigin(state.origin);
web_frame_->setReplicatedSandboxFlags(state.sandbox_flags);
- web_frame_->setReplicatedName(blink::WebString::fromUTF8(state.name));
+ web_frame_->setReplicatedName(blink::WebString::fromUTF8(state.name),
+ blink::WebString::fromUTF8(state.unique_name));
web_frame_->setReplicatedShouldEnforceStrictMixedContentChecking(
state.should_enforce_strict_mixed_content_checking);
}
@@ -333,8 +335,10 @@ void RenderFrameProxy::OnDispatchLoad() {
web_frame_->DispatchLoadEventForFrameOwner();
}
-void RenderFrameProxy::OnDidUpdateName(const std::string& name) {
- web_frame_->setReplicatedName(blink::WebString::fromUTF8(name));
+void RenderFrameProxy::OnDidUpdateName(const std::string& name,
+ const std::string& unique_name) {
+ web_frame_->setReplicatedName(blink::WebString::fromUTF8(name),
+ blink::WebString::fromUTF8(unique_name));
}
void RenderFrameProxy::OnEnforceStrictMixedContentChecking(

Powered by Google App Engine
This is Rietveld 408576698