| Index: content/renderer/render_frame_proxy.cc
|
| diff --git a/content/renderer/render_frame_proxy.cc b/content/renderer/render_frame_proxy.cc
|
| index f127ee17556517ac0a1c3a7331f5b650a38c7078..913362252c26a54601f1978d059236ae0b77ffce 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(
|
|
|