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

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

Issue 628773003: Partially convert geolocation IPC to Mojo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 1 month 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 "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/containers/hash_tables.h" 9 #include "base/containers/hash_tables.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
11 #include "base/metrics/histogram.h" 11 #include "base/metrics/histogram.h"
12 #include "base/metrics/user_metrics_action.h" 12 #include "base/metrics/user_metrics_action.h"
13 #include "base/time/time.h" 13 #include "base/time/time.h"
14 #include "content/browser/accessibility/accessibility_mode_helper.h" 14 #include "content/browser/accessibility/accessibility_mode_helper.h"
15 #include "content/browser/accessibility/browser_accessibility_manager.h" 15 #include "content/browser/accessibility/browser_accessibility_manager.h"
16 #include "content/browser/accessibility/browser_accessibility_state_impl.h" 16 #include "content/browser/accessibility/browser_accessibility_state_impl.h"
17 #include "content/browser/child_process_security_policy_impl.h" 17 #include "content/browser/child_process_security_policy_impl.h"
18 #include "content/browser/frame_host/cross_process_frame_connector.h" 18 #include "content/browser/frame_host/cross_process_frame_connector.h"
19 #include "content/browser/frame_host/cross_site_transferring_request.h" 19 #include "content/browser/frame_host/cross_site_transferring_request.h"
20 #include "content/browser/frame_host/frame_accessibility.h" 20 #include "content/browser/frame_host/frame_accessibility.h"
21 #include "content/browser/frame_host/frame_tree.h" 21 #include "content/browser/frame_host/frame_tree.h"
22 #include "content/browser/frame_host/frame_tree_node.h" 22 #include "content/browser/frame_host/frame_tree_node.h"
23 #include "content/browser/frame_host/navigator.h" 23 #include "content/browser/frame_host/navigator.h"
24 #include "content/browser/frame_host/render_frame_host_delegate.h" 24 #include "content/browser/frame_host/render_frame_host_delegate.h"
25 #include "content/browser/frame_host/render_frame_proxy_host.h" 25 #include "content/browser/frame_host/render_frame_proxy_host.h"
26 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" 26 #include "content/browser/frame_host/render_widget_host_view_child_frame.h"
27 #include "content/browser/geolocation/geolocation_service_context.h"
27 #include "content/browser/renderer_host/input/input_router.h" 28 #include "content/browser/renderer_host/input/input_router.h"
28 #include "content/browser/renderer_host/input/timeout_monitor.h" 29 #include "content/browser/renderer_host/input/timeout_monitor.h"
29 #include "content/browser/renderer_host/render_process_host_impl.h" 30 #include "content/browser/renderer_host/render_process_host_impl.h"
30 #include "content/browser/renderer_host/render_view_host_delegate.h" 31 #include "content/browser/renderer_host/render_view_host_delegate.h"
31 #include "content/browser/renderer_host/render_view_host_delegate_view.h" 32 #include "content/browser/renderer_host/render_view_host_delegate_view.h"
32 #include "content/browser/renderer_host/render_view_host_impl.h" 33 #include "content/browser/renderer_host/render_view_host_impl.h"
33 #include "content/browser/renderer_host/render_widget_host_impl.h" 34 #include "content/browser/renderer_host/render_widget_host_impl.h"
34 #include "content/browser/renderer_host/render_widget_host_view_base.h" 35 #include "content/browser/renderer_host/render_widget_host_view_base.h"
35 #include "content/browser/transition_request_manager.h" 36 #include "content/browser/transition_request_manager.h"
36 #include "content/common/accessibility_messages.h" 37 #include "content/common/accessibility_messages.h"
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 this)); 204 this));
204 205
205 if (is_swapped_out) { 206 if (is_swapped_out) {
206 rfh_state_ = STATE_SWAPPED_OUT; 207 rfh_state_ = STATE_SWAPPED_OUT;
207 } else { 208 } else {
208 rfh_state_ = STATE_DEFAULT; 209 rfh_state_ = STATE_DEFAULT;
209 GetSiteInstance()->increment_active_frame_count(); 210 GetSiteInstance()->increment_active_frame_count();
210 } 211 }
211 212
212 SetUpMojoIfNeeded(); 213 SetUpMojoIfNeeded();
213
214 swapout_event_monitor_timeout_.reset(new TimeoutMonitor(base::Bind( 214 swapout_event_monitor_timeout_.reset(new TimeoutMonitor(base::Bind(
215 &RenderFrameHostImpl::OnSwappedOut, weak_ptr_factory_.GetWeakPtr()))); 215 &RenderFrameHostImpl::OnSwappedOut, weak_ptr_factory_.GetWeakPtr())));
216 } 216 }
217 217
218 RenderFrameHostImpl::~RenderFrameHostImpl() { 218 RenderFrameHostImpl::~RenderFrameHostImpl() {
219 GetProcess()->RemoveRoute(routing_id_); 219 GetProcess()->RemoveRoute(routing_id_);
220 g_routing_id_frame_map.Get().erase( 220 g_routing_id_frame_map.Get().erase(
221 RenderFrameHostID(GetProcess()->GetID(), routing_id_)); 221 RenderFrameHostID(GetProcess()->GetID(), routing_id_));
222 222
223 if (delegate_) 223 if (delegate_)
(...skipping 993 matching lines...) Expand 10 before | Expand all | Expand 10 after
1217 } 1217 }
1218 1218
1219 void RenderFrameHostImpl::OnHidePopup() { 1219 void RenderFrameHostImpl::OnHidePopup() {
1220 RenderViewHostDelegateView* view = 1220 RenderViewHostDelegateView* view =
1221 render_view_host_->delegate_->GetDelegateView(); 1221 render_view_host_->delegate_->GetDelegateView();
1222 if (view) 1222 if (view)
1223 view->HidePopupMenu(); 1223 view->HidePopupMenu();
1224 } 1224 }
1225 #endif 1225 #endif
1226 1226
1227 void RenderFrameHostImpl::RegisterMojoServices() {
1228 GeolocationServiceContext* geolocation_service_context =
1229 delegate_ ? delegate_->GetGeolocationServiceContext() : NULL;
1230 if (geolocation_service_context) {
1231 // TODO(creis): Bind process ID here so that GeolocationServiceImpl
1232 // can perform permissions checks once site isolation is complete.
1233 // crbug.com/426384
1234 GetServiceRegistry()->AddService<GeolocationService>(
1235 base::Bind(&GeolocationServiceContext::CreateService,
1236 base::Unretained(geolocation_service_context),
1237 base::Bind(&RenderFrameHostImpl::DidUseGeolocationPermission,
1238 base::Unretained(this))));
1239 }
1240 }
1241
1227 void RenderFrameHostImpl::SetState(RenderFrameHostImplState rfh_state) { 1242 void RenderFrameHostImpl::SetState(RenderFrameHostImplState rfh_state) {
1228 // Only main frames should be swapped out and retained inside a proxy host. 1243 // Only main frames should be swapped out and retained inside a proxy host.
1229 if (rfh_state == STATE_SWAPPED_OUT) 1244 if (rfh_state == STATE_SWAPPED_OUT)
1230 CHECK(!GetParent()); 1245 CHECK(!GetParent());
1231 1246
1232 // We update the number of RenderFrameHosts in a SiteInstance when the swapped 1247 // We update the number of RenderFrameHosts in a SiteInstance when the swapped
1233 // out status of a RenderFrameHost gets flipped to/from active. 1248 // out status of a RenderFrameHost gets flipped to/from active.
1234 if (!IsRFHStateActive(rfh_state_) && IsRFHStateActive(rfh_state)) 1249 if (!IsRFHStateActive(rfh_state_) && IsRFHStateActive(rfh_state))
1235 GetSiteInstance()->increment_active_frame_count(); 1250 GetSiteInstance()->increment_active_frame_count();
1236 else if (IsRFHStateActive(rfh_state_) && !IsRFHStateActive(rfh_state)) 1251 else if (IsRFHStateActive(rfh_state_) && !IsRFHStateActive(rfh_state))
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
1442 } 1457 }
1443 1458
1444 void RenderFrameHostImpl::SetUpMojoIfNeeded() { 1459 void RenderFrameHostImpl::SetUpMojoIfNeeded() {
1445 if (service_registry_.get()) 1460 if (service_registry_.get())
1446 return; 1461 return;
1447 1462
1448 service_registry_.reset(new ServiceRegistryImpl()); 1463 service_registry_.reset(new ServiceRegistryImpl());
1449 if (!GetProcess()->GetServiceRegistry()) 1464 if (!GetProcess()->GetServiceRegistry())
1450 return; 1465 return;
1451 1466
1467 RegisterMojoServices();
1452 RenderFrameSetupPtr setup; 1468 RenderFrameSetupPtr setup;
1453 GetProcess()->GetServiceRegistry()->ConnectToRemoteService(&setup); 1469 GetProcess()->GetServiceRegistry()->ConnectToRemoteService(&setup);
1454 mojo::ServiceProviderPtr service_provider; 1470 mojo::ServiceProviderPtr service_provider;
1455 setup->GetServiceProviderForFrame(routing_id_, 1471 setup->GetServiceProviderForFrame(routing_id_,
1456 mojo::GetProxy(&service_provider)); 1472 mojo::GetProxy(&service_provider));
1457 service_registry_->BindRemoteServiceProvider( 1473 service_registry_->BindRemoteServiceProvider(
1458 service_provider.PassMessagePipe()); 1474 service_provider.PassMessagePipe());
1459 1475
1460 #if defined(OS_ANDROID) 1476 #if defined(OS_ANDROID)
1461 service_registry_android_.reset( 1477 service_registry_android_.reset(
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
1629 void RenderFrameHostImpl::CancelSuspendedNavigations() { 1645 void RenderFrameHostImpl::CancelSuspendedNavigations() {
1630 // Clear any state if a pending navigation is canceled or preempted. 1646 // Clear any state if a pending navigation is canceled or preempted.
1631 if (suspended_nav_params_) 1647 if (suspended_nav_params_)
1632 suspended_nav_params_.reset(); 1648 suspended_nav_params_.reset();
1633 1649
1634 TRACE_EVENT_ASYNC_END0("navigation", 1650 TRACE_EVENT_ASYNC_END0("navigation",
1635 "RenderFrameHostImpl navigation suspended", this); 1651 "RenderFrameHostImpl navigation suspended", this);
1636 navigations_suspended_ = false; 1652 navigations_suspended_ = false;
1637 } 1653 }
1638 1654
1655 void RenderFrameHostImpl::DidUseGeolocationPermission() {
1656 RenderFrameHost* top_frame = frame_tree_node()->frame_tree()->GetMainFrame();
1657 GetContentClient()->browser()->RegisterPermissionUsage(
1658 PERMISSION_GEOLOCATION,
1659 delegate_->GetAsWebContents(),
1660 GetLastCommittedURL().GetOrigin(),
1661 top_frame->GetLastCommittedURL().GetOrigin());
1662 }
1663
1639 } // namespace content 1664 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/render_frame_host_impl.h ('k') | content/browser/geolocation/geolocation_dispatcher_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698