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

Side by Side Diff: content/renderer/render_frame_proxy.cc

Issue 837283003: Start replicating sandbox flags for OOPIF (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add conversion functions for SandboxFlags Created 5 years, 11 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_frame_proxy.h" 5 #include "content/renderer/render_frame_proxy.h"
6 6
7 #include <map> 7 #include <map>
8 8
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "content/child/webmessageportchannel_impl.h" 10 #include "content/child/webmessageportchannel_impl.h"
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 150
151 void RenderFrameProxy::DidCommitCompositorFrame() { 151 void RenderFrameProxy::DidCommitCompositorFrame() {
152 if (compositing_helper_.get()) 152 if (compositing_helper_.get())
153 compositing_helper_->DidCommitCompositorFrame(); 153 compositing_helper_->DidCommitCompositorFrame();
154 } 154 }
155 155
156 void RenderFrameProxy::SetReplicatedState(const FrameReplicationState& state) { 156 void RenderFrameProxy::SetReplicatedState(const FrameReplicationState& state) {
157 DCHECK(web_frame_); 157 DCHECK(web_frame_);
158 web_frame_->setReplicatedOrigin(blink::WebSecurityOrigin::createFromString( 158 web_frame_->setReplicatedOrigin(blink::WebSecurityOrigin::createFromString(
159 blink::WebString::fromUTF8(state.origin.string()))); 159 blink::WebString::fromUTF8(state.origin.string())));
160 web_frame_->setReplicatedSandboxFlags(
161 RenderFrameImpl::ContentToWebSandboxFlags(state.sandbox_flags));
160 } 162 }
161 163
162 bool RenderFrameProxy::OnMessageReceived(const IPC::Message& msg) { 164 bool RenderFrameProxy::OnMessageReceived(const IPC::Message& msg) {
163 bool handled = true; 165 bool handled = true;
164 IPC_BEGIN_MESSAGE_MAP(RenderFrameProxy, msg) 166 IPC_BEGIN_MESSAGE_MAP(RenderFrameProxy, msg)
165 IPC_MESSAGE_HANDLER(FrameMsg_DeleteProxy, OnDeleteProxy) 167 IPC_MESSAGE_HANDLER(FrameMsg_DeleteProxy, OnDeleteProxy)
166 IPC_MESSAGE_HANDLER(FrameMsg_ChildFrameProcessGone, OnChildFrameProcessGone) 168 IPC_MESSAGE_HANDLER(FrameMsg_ChildFrameProcessGone, OnChildFrameProcessGone)
167 IPC_MESSAGE_HANDLER_GENERIC(FrameMsg_CompositorFrameSwapped, 169 IPC_MESSAGE_HANDLER_GENERIC(FrameMsg_CompositorFrameSwapped,
168 OnCompositorFrameSwapped(msg)) 170 OnCompositorFrameSwapped(msg))
169 IPC_MESSAGE_HANDLER(FrameMsg_DisownOpener, OnDisownOpener) 171 IPC_MESSAGE_HANDLER(FrameMsg_DisownOpener, OnDisownOpener)
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 blink::WebUserGestureIndicator::isProcessingUserGesture(); 318 blink::WebUserGestureIndicator::isProcessingUserGesture();
317 blink::WebUserGestureIndicator::consumeUserGesture(); 319 blink::WebUserGestureIndicator::consumeUserGesture();
318 Send(new FrameHostMsg_OpenURL(routing_id_, params)); 320 Send(new FrameHostMsg_OpenURL(routing_id_, params));
319 } 321 }
320 322
321 void RenderFrameProxy::forwardInputEvent(const blink::WebInputEvent* event) { 323 void RenderFrameProxy::forwardInputEvent(const blink::WebInputEvent* event) {
322 Send(new FrameHostMsg_ForwardInputEvent(routing_id_, event)); 324 Send(new FrameHostMsg_ForwardInputEvent(routing_id_, event));
323 } 325 }
324 326
325 } // namespace 327 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698