OLD | NEW |
---|---|
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 <algorithm> | 7 #include <algorithm> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 1806 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1817 std::string old_name = frame_tree_node()->frame_name(); | 1817 std::string old_name = frame_tree_node()->frame_name(); |
1818 frame_tree_node()->SetFrameName(name, unique_name); | 1818 frame_tree_node()->SetFrameName(name, unique_name); |
1819 if (old_name.empty() && !name.empty()) | 1819 if (old_name.empty() && !name.empty()) |
1820 frame_tree_node_->render_manager()->CreateProxiesForNewNamedFrame(); | 1820 frame_tree_node_->render_manager()->CreateProxiesForNewNamedFrame(); |
1821 delegate_->DidChangeName(this, name); | 1821 delegate_->DidChangeName(this, name); |
1822 } | 1822 } |
1823 | 1823 |
1824 void RenderFrameHostImpl::OnDidSetFeaturePolicyHeader( | 1824 void RenderFrameHostImpl::OnDidSetFeaturePolicyHeader( |
1825 const ParsedFeaturePolicyHeader& parsed_header) { | 1825 const ParsedFeaturePolicyHeader& parsed_header) { |
1826 frame_tree_node()->SetFeaturePolicyHeader(parsed_header); | 1826 frame_tree_node()->SetFeaturePolicyHeader(parsed_header); |
1827 ResetFeaturePolicy(); | |
1828 feature_policy_->SetHeaderPolicy(parsed_header); | |
1827 } | 1829 } |
1828 | 1830 |
1829 void RenderFrameHostImpl::OnDidAddContentSecurityPolicy( | 1831 void RenderFrameHostImpl::OnDidAddContentSecurityPolicy( |
1830 const ContentSecurityPolicyHeader& header) { | 1832 const ContentSecurityPolicyHeader& header) { |
1831 frame_tree_node()->AddContentSecurityPolicy(header); | 1833 frame_tree_node()->AddContentSecurityPolicy(header); |
1832 } | 1834 } |
1833 | 1835 |
1834 void RenderFrameHostImpl::OnEnforceInsecureRequestPolicy( | 1836 void RenderFrameHostImpl::OnEnforceInsecureRequestPolicy( |
1835 blink::WebInsecureRequestPolicy policy) { | 1837 blink::WebInsecureRequestPolicy policy) { |
1836 frame_tree_node()->SetInsecureRequestPolicy(policy); | 1838 frame_tree_node()->SetInsecureRequestPolicy(policy); |
(...skipping 1517 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3354 auto it = std::find_if( | 3356 auto it = std::find_if( |
3355 web_bluetooth_services_.begin(), web_bluetooth_services_.end(), | 3357 web_bluetooth_services_.begin(), web_bluetooth_services_.end(), |
3356 [web_bluetooth_service]( | 3358 [web_bluetooth_service]( |
3357 const std::unique_ptr<WebBluetoothServiceImpl>& service) { | 3359 const std::unique_ptr<WebBluetoothServiceImpl>& service) { |
3358 return web_bluetooth_service == service.get(); | 3360 return web_bluetooth_service == service.get(); |
3359 }); | 3361 }); |
3360 DCHECK(it != web_bluetooth_services_.end()); | 3362 DCHECK(it != web_bluetooth_services_.end()); |
3361 web_bluetooth_services_.erase(it); | 3363 web_bluetooth_services_.erase(it); |
3362 } | 3364 } |
3363 | 3365 |
3366 const FeaturePolicy* RenderFrameHostImpl::GetFeaturePolicy() { | |
alexmos
2017/02/09 05:59:50
This is a simple getter, so it could just go inlin
iclelland
2017/02/09 17:16:17
Done.
| |
3367 return feature_policy_.get(); | |
3368 } | |
3369 | |
3370 void RenderFrameHostImpl::ResetFeaturePolicy() { | |
3371 RenderFrameHostImpl* parent_frame_host = GetParent(); | |
3372 const FeaturePolicy* parent_policy = | |
3373 parent_frame_host ? parent_frame_host->GetFeaturePolicy() : nullptr; | |
3374 feature_policy_ = FeaturePolicy::CreateFromParentPolicy( | |
3375 parent_policy, last_committed_origin_); | |
3376 } | |
3377 | |
3364 void RenderFrameHostImpl::Create( | 3378 void RenderFrameHostImpl::Create( |
3365 const service_manager::Identity& remote_identity, | 3379 const service_manager::Identity& remote_identity, |
3366 media::mojom::InterfaceFactoryRequest request) { | 3380 media::mojom::InterfaceFactoryRequest request) { |
3367 DCHECK(!media_interface_proxy_); | 3381 DCHECK(!media_interface_proxy_); |
3368 media_interface_proxy_.reset(new MediaInterfaceProxy( | 3382 media_interface_proxy_.reset(new MediaInterfaceProxy( |
3369 this, std::move(request), | 3383 this, std::move(request), |
3370 base::Bind(&RenderFrameHostImpl::OnMediaInterfaceFactoryConnectionError, | 3384 base::Bind(&RenderFrameHostImpl::OnMediaInterfaceFactoryConnectionError, |
3371 base::Unretained(this)))); | 3385 base::Unretained(this)))); |
3372 } | 3386 } |
3373 | 3387 |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3454 // There is no pending NavigationEntry in these cases, so pass 0 as the | 3468 // There is no pending NavigationEntry in these cases, so pass 0 as the |
3455 // pending_nav_entry_id. If the previous handle was a prematurely aborted | 3469 // pending_nav_entry_id. If the previous handle was a prematurely aborted |
3456 // navigation loaded via LoadDataWithBaseURL, propagate the entry id. | 3470 // navigation loaded via LoadDataWithBaseURL, propagate the entry id. |
3457 return NavigationHandleImpl::Create( | 3471 return NavigationHandleImpl::Create( |
3458 params.url, params.redirects, frame_tree_node_, is_renderer_initiated, | 3472 params.url, params.redirects, frame_tree_node_, is_renderer_initiated, |
3459 params.was_within_same_page, base::TimeTicks::Now(), | 3473 params.was_within_same_page, base::TimeTicks::Now(), |
3460 entry_id_for_data_nav, false); // started_from_context_menu | 3474 entry_id_for_data_nav, false); // started_from_context_menu |
3461 } | 3475 } |
3462 | 3476 |
3463 } // namespace content | 3477 } // namespace content |
OLD | NEW |