diff options
| author | alexmos <alexmos@chromium.org> | 2015-02-17 09:59:45 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-17 18:00:28 +0000 |
| commit | 81a14d049fd77caf3b5f97cdf446f31a500b5bad (patch) | |
| tree | 06bc5aabebb15a7aa75aeadf2c49e607bba55f1e /content | |
| parent | fb08a0fa2c10544e102bcadeadd08c6815055752 (diff) | |
| download | chromium_src-81a14d049fd77caf3b5f97cdf446f31a500b5bad.zip chromium_src-81a14d049fd77caf3b5f97cdf446f31a500b5bad.tar.gz chromium_src-81a14d049fd77caf3b5f97cdf446f31a500b5bad.tar.bz2 | |
Update createRemoteChild to pass SandboxFlags.
Until now, the FrameOwner for remote frames with a remote parent was a PlaceholderFrameOwner, which couldn't store sandbox flags. The Blink side of this CL replaces PlaceholderFrameOwner with a RemoteBridgeFrameOwner, which does store sandbox flags, and with this change, we will initialize them using the replicated state that's already passed in to CreateFrameProxy.
Corresponding Blink patch (needs to land first): https://codereview.chromium.org/910313004/
BUG=426512
Review URL: https://codereview.chromium.org/886923004
Cr-Commit-Position: refs/heads/master@{#316604}
Diffstat (limited to 'content')
| -rw-r--r-- | content/renderer/render_frame_proxy.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/content/renderer/render_frame_proxy.cc b/content/renderer/render_frame_proxy.cc index cb42b40..e98add4 100644 --- a/content/renderer/render_frame_proxy.cc +++ b/content/renderer/render_frame_proxy.cc @@ -74,7 +74,10 @@ RenderFrameProxy* RenderFrameProxy::CreateFrameProxy( RenderFrameProxy* parent = RenderFrameProxy::FromRoutingID(parent_routing_id); web_frame = parent->web_frame()->createRemoteChild( - blink::WebString::fromUTF8(replicated_state.name), proxy.get()); + blink::WebString::fromUTF8(replicated_state.name), + RenderFrameImpl::ContentToWebSandboxFlags( + replicated_state.sandbox_flags), + proxy.get()); render_view = parent->render_view(); } |