| Index: content/renderer/render_frame_proxy.cc
|
| diff --git a/content/renderer/render_frame_proxy.cc b/content/renderer/render_frame_proxy.cc
|
| index eaaa2abeaa546e0a8f0d85b8c4a43527189ef735..94a3e86752bf0e7c822e633b968eb7e478361e21 100644
|
| --- a/content/renderer/render_frame_proxy.cc
|
| +++ b/content/renderer/render_frame_proxy.cc
|
| @@ -165,7 +165,7 @@ void RenderFrameProxy::DidCommitCompositorFrame() {
|
| void RenderFrameProxy::SetReplicatedState(const FrameReplicationState& state) {
|
| DCHECK(web_frame_);
|
| web_frame_->setReplicatedOrigin(blink::WebSecurityOrigin::createFromString(
|
| - blink::WebString::fromUTF8(state.origin.string())));
|
| + blink::WebString::fromUTF8(state.origin.serialize())));
|
| web_frame_->setReplicatedSandboxFlags(
|
| RenderFrameImpl::ContentToWebSandboxFlags(state.sandbox_flags));
|
| web_frame_->setReplicatedName(blink::WebString::fromUTF8(state.name));
|
| @@ -302,7 +302,7 @@ void RenderFrameProxy::OnDidUpdateName(const std::string& name) {
|
|
|
| void RenderFrameProxy::OnDidUpdateOrigin(const url::Origin& origin) {
|
| web_frame_->setReplicatedOrigin(blink::WebSecurityOrigin::createFromString(
|
| - blink::WebString::fromUTF8(origin.string())));
|
| + blink::WebString::fromUTF8(origin.serialize())));
|
| }
|
|
|
| void RenderFrameProxy::frameDetached() {
|
|
|