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

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

Issue 2557063002: Upgrade Insecure Requests: bugfixes, tests, and support for OOPIF.
Patch Set: Addressed comments (@nasko #2). Created 4 years 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 <stdint.h> 7 #include <stdint.h>
8 #include <map> 8 #include <map>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 void RenderFrameProxy::DidCommitCompositorFrame() { 231 void RenderFrameProxy::DidCommitCompositorFrame() {
232 } 232 }
233 233
234 void RenderFrameProxy::SetReplicatedState(const FrameReplicationState& state) { 234 void RenderFrameProxy::SetReplicatedState(const FrameReplicationState& state) {
235 DCHECK(web_frame_); 235 DCHECK(web_frame_);
236 web_frame_->setReplicatedOrigin(state.origin); 236 web_frame_->setReplicatedOrigin(state.origin);
237 web_frame_->setReplicatedSandboxFlags(state.sandbox_flags); 237 web_frame_->setReplicatedSandboxFlags(state.sandbox_flags);
238 web_frame_->setReplicatedName(blink::WebString::fromUTF8(state.name), 238 web_frame_->setReplicatedName(blink::WebString::fromUTF8(state.name),
239 blink::WebString::fromUTF8(state.unique_name)); 239 blink::WebString::fromUTF8(state.unique_name));
240 web_frame_->setReplicatedInsecureRequestPolicy(state.insecure_request_policy); 240 web_frame_->setReplicatedInsecureRequestPolicy(state.insecure_request_policy);
241 web_frame_->setReplicatedInsecureNavigationsSet(
242 state.insecure_navigations_set);
241 web_frame_->setReplicatedPotentiallyTrustworthyUniqueOrigin( 243 web_frame_->setReplicatedPotentiallyTrustworthyUniqueOrigin(
242 state.has_potentially_trustworthy_unique_origin); 244 state.has_potentially_trustworthy_unique_origin);
243 web_frame_->setReplicatedFeaturePolicyHeader( 245 web_frame_->setReplicatedFeaturePolicyHeader(
244 ToWebParsedFeaturePolicy(state.feature_policy_header)); 246 ToWebParsedFeaturePolicy(state.feature_policy_header));
245 247
246 web_frame_->resetReplicatedContentSecurityPolicy(); 248 web_frame_->resetReplicatedContentSecurityPolicy();
247 for (const auto& header : state.accumulated_csp_headers) 249 for (const auto& header : state.accumulated_csp_headers)
248 OnAddContentSecurityPolicy(header); 250 OnAddContentSecurityPolicy(header);
249 } 251 }
250 252
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 IPC_MESSAGE_HANDLER(FrameMsg_DidStopLoading, OnDidStopLoading) 290 IPC_MESSAGE_HANDLER(FrameMsg_DidStopLoading, OnDidStopLoading)
289 IPC_MESSAGE_HANDLER(FrameMsg_DidUpdateSandboxFlags, OnDidUpdateSandboxFlags) 291 IPC_MESSAGE_HANDLER(FrameMsg_DidUpdateSandboxFlags, OnDidUpdateSandboxFlags)
290 IPC_MESSAGE_HANDLER(FrameMsg_DispatchLoad, OnDispatchLoad) 292 IPC_MESSAGE_HANDLER(FrameMsg_DispatchLoad, OnDispatchLoad)
291 IPC_MESSAGE_HANDLER(FrameMsg_DidUpdateName, OnDidUpdateName) 293 IPC_MESSAGE_HANDLER(FrameMsg_DidUpdateName, OnDidUpdateName)
292 IPC_MESSAGE_HANDLER(FrameMsg_AddContentSecurityPolicy, 294 IPC_MESSAGE_HANDLER(FrameMsg_AddContentSecurityPolicy,
293 OnAddContentSecurityPolicy) 295 OnAddContentSecurityPolicy)
294 IPC_MESSAGE_HANDLER(FrameMsg_ResetContentSecurityPolicy, 296 IPC_MESSAGE_HANDLER(FrameMsg_ResetContentSecurityPolicy,
295 OnResetContentSecurityPolicy) 297 OnResetContentSecurityPolicy)
296 IPC_MESSAGE_HANDLER(FrameMsg_EnforceInsecureRequestPolicy, 298 IPC_MESSAGE_HANDLER(FrameMsg_EnforceInsecureRequestPolicy,
297 OnEnforceInsecureRequestPolicy) 299 OnEnforceInsecureRequestPolicy)
300 IPC_MESSAGE_HANDLER(FrameMsg_EnforceInsecureNavigationsSet,
301 OnEnforceInsecureNavigationsSet)
298 IPC_MESSAGE_HANDLER(FrameMsg_SetFrameOwnerProperties, 302 IPC_MESSAGE_HANDLER(FrameMsg_SetFrameOwnerProperties,
299 OnSetFrameOwnerProperties) 303 OnSetFrameOwnerProperties)
300 IPC_MESSAGE_HANDLER(FrameMsg_DidUpdateOrigin, OnDidUpdateOrigin) 304 IPC_MESSAGE_HANDLER(FrameMsg_DidUpdateOrigin, OnDidUpdateOrigin)
301 IPC_MESSAGE_HANDLER(InputMsg_SetFocus, OnSetPageFocus) 305 IPC_MESSAGE_HANDLER(InputMsg_SetFocus, OnSetPageFocus)
302 IPC_MESSAGE_HANDLER(FrameMsg_SetFocusedFrame, OnSetFocusedFrame) 306 IPC_MESSAGE_HANDLER(FrameMsg_SetFocusedFrame, OnSetFocusedFrame)
303 IPC_MESSAGE_HANDLER(FrameMsg_WillEnterFullscreen, OnWillEnterFullscreen) 307 IPC_MESSAGE_HANDLER(FrameMsg_WillEnterFullscreen, OnWillEnterFullscreen)
304 IPC_MESSAGE_UNHANDLED(handled = false) 308 IPC_MESSAGE_UNHANDLED(handled = false)
305 IPC_END_MESSAGE_MAP() 309 IPC_END_MESSAGE_MAP()
306 310
307 // Note: If |handled| is true, |this| may have been deleted. 311 // Note: If |handled| is true, |this| may have been deleted.
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 378
375 void RenderFrameProxy::OnResetContentSecurityPolicy() { 379 void RenderFrameProxy::OnResetContentSecurityPolicy() {
376 web_frame_->resetReplicatedContentSecurityPolicy(); 380 web_frame_->resetReplicatedContentSecurityPolicy();
377 } 381 }
378 382
379 void RenderFrameProxy::OnEnforceInsecureRequestPolicy( 383 void RenderFrameProxy::OnEnforceInsecureRequestPolicy(
380 blink::WebInsecureRequestPolicy policy) { 384 blink::WebInsecureRequestPolicy policy) {
381 web_frame_->setReplicatedInsecureRequestPolicy(policy); 385 web_frame_->setReplicatedInsecureRequestPolicy(policy);
382 } 386 }
383 387
388 void RenderFrameProxy::OnEnforceInsecureNavigationsSet(
389 const std::vector<uint32_t>& set) {
390 web_frame_->setReplicatedInsecureNavigationsSet(set);
391 }
392
384 void RenderFrameProxy::OnSetFrameOwnerProperties( 393 void RenderFrameProxy::OnSetFrameOwnerProperties(
385 const FrameOwnerProperties& properties) { 394 const FrameOwnerProperties& properties) {
386 web_frame_->setFrameOwnerProperties(properties.ToWebFrameOwnerProperties()); 395 web_frame_->setFrameOwnerProperties(properties.ToWebFrameOwnerProperties());
387 } 396 }
388 397
389 void RenderFrameProxy::OnDidUpdateOrigin( 398 void RenderFrameProxy::OnDidUpdateOrigin(
390 const url::Origin& origin, 399 const url::Origin& origin,
391 bool is_potentially_trustworthy_unique_origin) { 400 bool is_potentially_trustworthy_unique_origin) {
392 web_frame_->setReplicatedOrigin(origin); 401 web_frame_->setReplicatedOrigin(origin);
393 web_frame_->setReplicatedPotentiallyTrustworthyUniqueOrigin( 402 web_frame_->setReplicatedPotentiallyTrustworthyUniqueOrigin(
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
520 blink::WebLocalFrame* source) { 529 blink::WebLocalFrame* source) {
521 int source_routing_id = RenderFrameImpl::FromWebFrame(source)->GetRoutingID(); 530 int source_routing_id = RenderFrameImpl::FromWebFrame(source)->GetRoutingID();
522 Send(new FrameHostMsg_AdvanceFocus(routing_id_, type, source_routing_id)); 531 Send(new FrameHostMsg_AdvanceFocus(routing_id_, type, source_routing_id));
523 } 532 }
524 533
525 void RenderFrameProxy::frameFocused() { 534 void RenderFrameProxy::frameFocused() {
526 Send(new FrameHostMsg_FrameFocused(routing_id_)); 535 Send(new FrameHostMsg_FrameFocused(routing_id_));
527 } 536 }
528 537
529 } // namespace 538 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698