| Index: content/renderer/render_frame_proxy.cc
|
| diff --git a/content/renderer/render_frame_proxy.cc b/content/renderer/render_frame_proxy.cc
|
| index 54d8085ac5b3d49dbb44e3df4f0646e361ba50d8..423a06c69e03a0d86ddfbc9bb63208d3f6ba6e80 100644
|
| --- a/content/renderer/render_frame_proxy.cc
|
| +++ b/content/renderer/render_frame_proxy.cc
|
| @@ -172,7 +172,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(state.sandbox_flags);
|
| web_frame_->setReplicatedName(blink::WebString::fromUTF8(state.name));
|
| }
|
| @@ -306,7 +306,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() {
|
|
|