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

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 2557063002: Upgrade Insecure Requests: bugfixes, tests, and support for OOPIF.
Patch Set: Upgrade Insecure Requests: bugfixes, tests, and support for OOPIF. 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/browser/frame_host/render_frame_host_impl.h" 5 #include "content/browser/frame_host/render_frame_host_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 702 matching lines...) Expand 10 before | Expand all | Expand 10 after
713 IPC_MESSAGE_HANDLER(FrameHostMsg_DidAccessInitialDocument, 713 IPC_MESSAGE_HANDLER(FrameHostMsg_DidAccessInitialDocument,
714 OnDidAccessInitialDocument) 714 OnDidAccessInitialDocument)
715 IPC_MESSAGE_HANDLER(FrameHostMsg_DidChangeOpener, OnDidChangeOpener) 715 IPC_MESSAGE_HANDLER(FrameHostMsg_DidChangeOpener, OnDidChangeOpener)
716 IPC_MESSAGE_HANDLER(FrameHostMsg_DidChangeName, OnDidChangeName) 716 IPC_MESSAGE_HANDLER(FrameHostMsg_DidChangeName, OnDidChangeName)
717 IPC_MESSAGE_HANDLER(FrameHostMsg_DidSetFeaturePolicyHeader, 717 IPC_MESSAGE_HANDLER(FrameHostMsg_DidSetFeaturePolicyHeader,
718 OnDidSetFeaturePolicyHeader) 718 OnDidSetFeaturePolicyHeader)
719 IPC_MESSAGE_HANDLER(FrameHostMsg_DidAddContentSecurityPolicy, 719 IPC_MESSAGE_HANDLER(FrameHostMsg_DidAddContentSecurityPolicy,
720 OnDidAddContentSecurityPolicy) 720 OnDidAddContentSecurityPolicy)
721 IPC_MESSAGE_HANDLER(FrameHostMsg_EnforceInsecureRequestPolicy, 721 IPC_MESSAGE_HANDLER(FrameHostMsg_EnforceInsecureRequestPolicy,
722 OnEnforceInsecureRequestPolicy) 722 OnEnforceInsecureRequestPolicy)
723 IPC_MESSAGE_HANDLER(FrameHostMsg_EnforceInsecureNavigationsSet,
724 OnEnforceInsecureNavigationsSet)
723 IPC_MESSAGE_HANDLER(FrameHostMsg_UpdateToUniqueOrigin, 725 IPC_MESSAGE_HANDLER(FrameHostMsg_UpdateToUniqueOrigin,
724 OnUpdateToUniqueOrigin) 726 OnUpdateToUniqueOrigin)
725 IPC_MESSAGE_HANDLER(FrameHostMsg_DidChangeSandboxFlags, 727 IPC_MESSAGE_HANDLER(FrameHostMsg_DidChangeSandboxFlags,
726 OnDidChangeSandboxFlags) 728 OnDidChangeSandboxFlags)
727 IPC_MESSAGE_HANDLER(FrameHostMsg_DidChangeFrameOwnerProperties, 729 IPC_MESSAGE_HANDLER(FrameHostMsg_DidChangeFrameOwnerProperties,
728 OnDidChangeFrameOwnerProperties) 730 OnDidChangeFrameOwnerProperties)
729 IPC_MESSAGE_HANDLER(FrameHostMsg_UpdateTitle, OnUpdateTitle) 731 IPC_MESSAGE_HANDLER(FrameHostMsg_UpdateTitle, OnUpdateTitle)
730 IPC_MESSAGE_HANDLER(FrameHostMsg_UpdateEncoding, OnUpdateEncoding) 732 IPC_MESSAGE_HANDLER(FrameHostMsg_UpdateEncoding, OnUpdateEncoding)
731 IPC_MESSAGE_HANDLER(FrameHostMsg_BeginNavigation, 733 IPC_MESSAGE_HANDLER(FrameHostMsg_BeginNavigation,
732 OnBeginNavigation) 734 OnBeginNavigation)
(...skipping 1015 matching lines...) Expand 10 before | Expand all | Expand 10 after
1748 void RenderFrameHostImpl::OnDidAddContentSecurityPolicy( 1750 void RenderFrameHostImpl::OnDidAddContentSecurityPolicy(
1749 const ContentSecurityPolicyHeader& header) { 1751 const ContentSecurityPolicyHeader& header) {
1750 frame_tree_node()->AddContentSecurityPolicy(header); 1752 frame_tree_node()->AddContentSecurityPolicy(header);
1751 } 1753 }
1752 1754
1753 void RenderFrameHostImpl::OnEnforceInsecureRequestPolicy( 1755 void RenderFrameHostImpl::OnEnforceInsecureRequestPolicy(
1754 blink::WebInsecureRequestPolicy policy) { 1756 blink::WebInsecureRequestPolicy policy) {
1755 frame_tree_node()->SetInsecureRequestPolicy(policy); 1757 frame_tree_node()->SetInsecureRequestPolicy(policy);
1756 } 1758 }
1757 1759
1760 void RenderFrameHostImpl::OnEnforceInsecureNavigationsSet(
1761 const std::vector<unsigned>& set) {
1762 frame_tree_node()->SetInsecureNavigationsSet(set);
1763 }
1764
1758 void RenderFrameHostImpl::OnUpdateToUniqueOrigin( 1765 void RenderFrameHostImpl::OnUpdateToUniqueOrigin(
1759 bool is_potentially_trustworthy_unique_origin) { 1766 bool is_potentially_trustworthy_unique_origin) {
1760 url::Origin origin; 1767 url::Origin origin;
1761 DCHECK(origin.unique()); 1768 DCHECK(origin.unique());
1762 frame_tree_node()->SetCurrentOrigin(origin, 1769 frame_tree_node()->SetCurrentOrigin(origin,
1763 is_potentially_trustworthy_unique_origin); 1770 is_potentially_trustworthy_unique_origin);
1764 } 1771 }
1765 1772
1766 FrameTreeNode* RenderFrameHostImpl::FindAndVerifyChild( 1773 FrameTreeNode* RenderFrameHostImpl::FindAndVerifyChild(
1767 int32_t child_frame_routing_id, 1774 int32_t child_frame_routing_id,
(...skipping 1560 matching lines...) Expand 10 before | Expand all | Expand 10 after
3328 // pending_nav_entry_id. If the previous handle was a prematurely aborted 3335 // pending_nav_entry_id. If the previous handle was a prematurely aborted
3329 // navigation loaded via LoadDataWithBaseURL, propagate the entry id. 3336 // navigation loaded via LoadDataWithBaseURL, propagate the entry id.
3330 return NavigationHandleImpl::Create( 3337 return NavigationHandleImpl::Create(
3331 params.url, frame_tree_node_, is_renderer_initiated, 3338 params.url, frame_tree_node_, is_renderer_initiated,
3332 params.was_within_same_page, base::TimeTicks::Now(), 3339 params.was_within_same_page, base::TimeTicks::Now(),
3333 entry_id_for_data_nav, params.gesture, 3340 entry_id_for_data_nav, params.gesture,
3334 false); // started_from_context_menu 3341 false); // started_from_context_menu
3335 } 3342 }
3336 3343
3337 } // namespace content 3344 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698