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

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

Issue 1422043007: Revert of Move WebUI ownership from the RenderFrameHostManager to the RenderFrameHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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/process/kill.h" 12 #include "base/process/kill.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/ax_tree_id_registry.h" 15 #include "content/browser/accessibility/ax_tree_id_registry.h"
16 #include "content/browser/accessibility/browser_accessibility_manager.h" 16 #include "content/browser/accessibility/browser_accessibility_manager.h"
17 #include "content/browser/accessibility/browser_accessibility_state_impl.h" 17 #include "content/browser/accessibility/browser_accessibility_state_impl.h"
18 #include "content/browser/child_process_security_policy_impl.h" 18 #include "content/browser/child_process_security_policy_impl.h"
19 #include "content/browser/child_process_security_policy_impl.h"
20 #include "content/browser/devtools/render_frame_devtools_agent_host.h" 19 #include "content/browser/devtools/render_frame_devtools_agent_host.h"
21 #include "content/browser/frame_host/cross_process_frame_connector.h" 20 #include "content/browser/frame_host/cross_process_frame_connector.h"
22 #include "content/browser/frame_host/cross_site_transferring_request.h" 21 #include "content/browser/frame_host/cross_site_transferring_request.h"
23 #include "content/browser/frame_host/frame_mojo_shell.h" 22 #include "content/browser/frame_host/frame_mojo_shell.h"
24 #include "content/browser/frame_host/frame_tree.h" 23 #include "content/browser/frame_host/frame_tree.h"
25 #include "content/browser/frame_host/frame_tree_node.h" 24 #include "content/browser/frame_host/frame_tree_node.h"
26 #include "content/browser/frame_host/navigation_handle_impl.h" 25 #include "content/browser/frame_host/navigation_handle_impl.h"
27 #include "content/browser/frame_host/navigation_request.h" 26 #include "content/browser/frame_host/navigation_request.h"
28 #include "content/browser/frame_host/navigator.h" 27 #include "content/browser/frame_host/navigator.h"
29 #include "content/browser/frame_host/navigator_impl.h" 28 #include "content/browser/frame_host/navigator_impl.h"
30 #include "content/browser/frame_host/render_frame_host_delegate.h" 29 #include "content/browser/frame_host/render_frame_host_delegate.h"
31 #include "content/browser/frame_host/render_frame_proxy_host.h" 30 #include "content/browser/frame_host/render_frame_proxy_host.h"
32 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" 31 #include "content/browser/frame_host/render_widget_host_view_child_frame.h"
33 #include "content/browser/geolocation/geolocation_service_context.h" 32 #include "content/browser/geolocation/geolocation_service_context.h"
34 #include "content/browser/permissions/permission_service_context.h" 33 #include "content/browser/permissions/permission_service_context.h"
35 #include "content/browser/permissions/permission_service_impl.h" 34 #include "content/browser/permissions/permission_service_impl.h"
36 #include "content/browser/presentation/presentation_service_impl.h" 35 #include "content/browser/presentation/presentation_service_impl.h"
37 #include "content/browser/renderer_host/input/input_router.h" 36 #include "content/browser/renderer_host/input/input_router.h"
38 #include "content/browser/renderer_host/input/timeout_monitor.h" 37 #include "content/browser/renderer_host/input/timeout_monitor.h"
39 #include "content/browser/renderer_host/render_process_host_impl.h" 38 #include "content/browser/renderer_host/render_process_host_impl.h"
40 #include "content/browser/renderer_host/render_view_host_delegate.h" 39 #include "content/browser/renderer_host/render_view_host_delegate.h"
41 #include "content/browser/renderer_host/render_view_host_delegate_view.h" 40 #include "content/browser/renderer_host/render_view_host_delegate_view.h"
42 #include "content/browser/renderer_host/render_view_host_impl.h" 41 #include "content/browser/renderer_host/render_view_host_impl.h"
43 #include "content/browser/renderer_host/render_widget_host_impl.h" 42 #include "content/browser/renderer_host/render_widget_host_impl.h"
44 #include "content/browser/renderer_host/render_widget_host_view_base.h" 43 #include "content/browser/renderer_host/render_widget_host_view_base.h"
45 #include "content/browser/wake_lock/wake_lock_service_context.h" 44 #include "content/browser/wake_lock/wake_lock_service_context.h"
46 #include "content/browser/webui/web_ui_controller_factory_registry.h"
47 #include "content/common/accessibility_messages.h" 45 #include "content/common/accessibility_messages.h"
48 #include "content/common/frame_messages.h" 46 #include "content/common/frame_messages.h"
49 #include "content/common/input_messages.h" 47 #include "content/common/input_messages.h"
50 #include "content/common/inter_process_time_ticks_converter.h" 48 #include "content/common/inter_process_time_ticks_converter.h"
51 #include "content/common/navigation_params.h" 49 #include "content/common/navigation_params.h"
52 #include "content/common/render_frame_setup.mojom.h" 50 #include "content/common/render_frame_setup.mojom.h"
53 #include "content/common/site_isolation_policy.h" 51 #include "content/common/site_isolation_policy.h"
54 #include "content/common/swapped_out_messages.h" 52 #include "content/common/swapped_out_messages.h"
55 #include "content/public/browser/ax_event_notification_details.h" 53 #include "content/public/browser/ax_event_notification_details.h"
56 #include "content/public/browser/browser_accessibility_state.h" 54 #include "content/public/browser/browser_accessibility_state.h"
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 routing_id_(routing_id), 186 routing_id_(routing_id),
189 render_frame_created_(false), 187 render_frame_created_(false),
190 navigations_suspended_(false), 188 navigations_suspended_(false),
191 is_waiting_for_beforeunload_ack_(false), 189 is_waiting_for_beforeunload_ack_(false),
192 unload_ack_is_for_navigation_(false), 190 unload_ack_is_for_navigation_(false),
193 is_loading_(false), 191 is_loading_(false),
194 pending_commit_(false), 192 pending_commit_(false),
195 accessibility_reset_token_(0), 193 accessibility_reset_token_(0),
196 accessibility_reset_count_(0), 194 accessibility_reset_count_(0),
197 no_create_browser_accessibility_manager_for_testing_(false), 195 no_create_browser_accessibility_manager_for_testing_(false),
198 web_ui_type_(WebUI::kNoWebUI),
199 weak_ptr_factory_(this) { 196 weak_ptr_factory_(this) {
200 bool is_swapped_out = !!(flags & CREATE_RF_SWAPPED_OUT); 197 bool is_swapped_out = !!(flags & CREATE_RF_SWAPPED_OUT);
201 bool hidden = !!(flags & CREATE_RF_HIDDEN); 198 bool hidden = !!(flags & CREATE_RF_HIDDEN);
202 frame_tree_->AddRenderViewHostRef(render_view_host_); 199 frame_tree_->AddRenderViewHostRef(render_view_host_);
203 GetProcess()->AddRoute(routing_id_, this); 200 GetProcess()->AddRoute(routing_id_, this);
204 g_routing_id_frame_map.Get().insert(std::make_pair( 201 g_routing_id_frame_map.Get().insert(std::make_pair(
205 RenderFrameHostID(GetProcess()->GetID(), routing_id_), 202 RenderFrameHostID(GetProcess()->GetID(), routing_id_),
206 this)); 203 this));
207 204
208 if (is_swapped_out) { 205 if (is_swapped_out) {
(...skipping 19 matching lines...) Expand all
228 render_widget_host_ = new RenderWidgetHostImpl(rwh_delegate, GetProcess(), 225 render_widget_host_ = new RenderWidgetHostImpl(rwh_delegate, GetProcess(),
229 widget_routing_id, hidden); 226 widget_routing_id, hidden);
230 render_widget_host_->set_owned_by_render_frame_host(true); 227 render_widget_host_->set_owned_by_render_frame_host(true);
231 } else { 228 } else {
232 DCHECK(!render_widget_host_->owned_by_render_frame_host()); 229 DCHECK(!render_widget_host_->owned_by_render_frame_host());
233 } 230 }
234 } 231 }
235 } 232 }
236 233
237 RenderFrameHostImpl::~RenderFrameHostImpl() { 234 RenderFrameHostImpl::~RenderFrameHostImpl() {
238 // Release the WebUI before all else as the WebUI accesses the RenderFrameHost
239 // during cleanup.
240 ResetWebUI();
241
242 GetProcess()->RemoveRoute(routing_id_); 235 GetProcess()->RemoveRoute(routing_id_);
243 g_routing_id_frame_map.Get().erase( 236 g_routing_id_frame_map.Get().erase(
244 RenderFrameHostID(GetProcess()->GetID(), routing_id_)); 237 RenderFrameHostID(GetProcess()->GetID(), routing_id_));
245 238
246 if (delegate_ && render_frame_created_) 239 if (delegate_ && render_frame_created_)
247 delegate_->RenderFrameDeleted(this); 240 delegate_->RenderFrameDeleted(this);
248 241
249 // If this was swapped out, it already decremented the active frame count of 242 // If this was swapped out, it already decremented the active frame count of
250 // the SiteInstance it belongs to. 243 // the SiteInstance it belongs to.
251 if (IsRFHStateActive(rfh_state_)) 244 if (IsRFHStateActive(rfh_state_))
(...skipping 947 matching lines...) Expand 10 before | Expand all | Expand 10 after
1199 } 1192 }
1200 1193
1201 void RenderFrameHostImpl::OnSwappedOut() { 1194 void RenderFrameHostImpl::OnSwappedOut() {
1202 // Ignore spurious swap out ack. 1195 // Ignore spurious swap out ack.
1203 if (rfh_state_ != STATE_PENDING_SWAP_OUT) 1196 if (rfh_state_ != STATE_PENDING_SWAP_OUT)
1204 return; 1197 return;
1205 1198
1206 TRACE_EVENT_ASYNC_END0("navigation", "RenderFrameHostImpl::SwapOut", this); 1199 TRACE_EVENT_ASYNC_END0("navigation", "RenderFrameHostImpl::SwapOut", this);
1207 swapout_event_monitor_timeout_->Stop(); 1200 swapout_event_monitor_timeout_->Stop();
1208 1201
1209 ResetWebUI();
1210 1202
1211 // If this is a main frame RFH that's about to be deleted, update its RVH's 1203 // If this is a main frame RFH that's about to be deleted, update its RVH's
1212 // swapped-out state here, since SetState won't be called once this RFH is 1204 // swapped-out state here, since SetState won't be called once this RFH is
1213 // deleted below. https://crbug.com/505887 1205 // deleted below. https://crbug.com/505887
1214 if (frame_tree_node_->IsMainFrame() && 1206 if (frame_tree_node_->IsMainFrame() &&
1215 frame_tree_node_->render_manager()->IsPendingDeletion(this)) { 1207 frame_tree_node_->render_manager()->IsPendingDeletion(this)) {
1216 render_view_host_->set_is_active(false); 1208 render_view_host_->set_is_active(false);
1217 render_view_host_->set_is_swapped_out(true); 1209 render_view_host_->set_is_swapped_out(true);
1218 } 1210 }
1219 1211
(...skipping 815 matching lines...) Expand 10 before | Expand all | Expand 10 after
2035 bool RenderFrameHostImpl::IsFocused() { 2027 bool RenderFrameHostImpl::IsFocused() {
2036 // TODO(mlamouri,kenrb): call GetRenderWidgetHost() directly when it stops 2028 // TODO(mlamouri,kenrb): call GetRenderWidgetHost() directly when it stops
2037 // returning nullptr in some cases. See https://crbug.com/455245. 2029 // returning nullptr in some cases. See https://crbug.com/455245.
2038 return RenderWidgetHostImpl::From( 2030 return RenderWidgetHostImpl::From(
2039 GetView()->GetRenderWidgetHost())->is_focused() && 2031 GetView()->GetRenderWidgetHost())->is_focused() &&
2040 frame_tree_->GetFocusedFrame() && 2032 frame_tree_->GetFocusedFrame() &&
2041 (frame_tree_->GetFocusedFrame() == frame_tree_node() || 2033 (frame_tree_->GetFocusedFrame() == frame_tree_node() ||
2042 frame_tree_->GetFocusedFrame()->IsDescendantOf(frame_tree_node())); 2034 frame_tree_->GetFocusedFrame()->IsDescendantOf(frame_tree_node()));
2043 } 2035 }
2044 2036
2045 bool RenderFrameHostImpl::UpdateWebUI(const GURL& dest_url,
2046 int entry_bindings) {
2047 WebUI::TypeID new_web_ui_type = WebUI::kNoWebUI;
2048 if (dest_url.is_valid()) {
2049 new_web_ui_type =
2050 WebUIControllerFactoryRegistry::GetInstance()->GetWebUIType(
2051 GetSiteInstance()->GetBrowserContext(), dest_url);
2052 }
2053
2054 WebUIImpl* prev_web_ui = web_ui_.get();
2055 if (new_web_ui_type == WebUI::kNoWebUI) {
2056 ResetWebUI();
2057 } else {
2058 // The current WebUI should be reused when dest_url requires a WebUI and its
2059 // type matches the current. Otherwise replace it with a new one.
2060 if (web_ui_type_ != new_web_ui_type) {
2061 web_ui_ = delegate_->CreateWebUIForRenderFrameHost(dest_url);
2062 DCHECK(web_ui_);
2063 web_ui_type_ = new_web_ui_type;
2064
2065 // If we have assigned (zero or more) bindings to the NavigationEntry in
2066 // the past, make sure we're not granting it different bindings than it
2067 // had before. If so, note it and don't give it any bindings, to avoid a
2068 // potential privilege escalation.
2069 if (entry_bindings != NavigationEntryImpl::kInvalidBindings &&
2070 web_ui_->GetBindings() != entry_bindings) {
2071 RecordAction(
2072 base::UserMetricsAction("ProcessSwapBindingsMismatch_RVHM"));
2073 ResetWebUI();
2074 return !!prev_web_ui;
2075 }
2076 }
2077 }
2078 DCHECK_EQ(!web_ui_, web_ui_type_ == WebUI::kNoWebUI);
2079
2080 // Check RenderViewHost for proper bindings.
2081 if (web_ui_ && !render_view_host_->GetProcess()->IsForGuestsOnly()) {
2082 // If a WebUI was created for the URL and the RenderView is not in a guest
2083 // process, then enable missing bindings with the RenderViewHost.
2084 int new_bindings = web_ui_->GetBindings();
2085 if ((render_view_host_->GetEnabledBindings() & new_bindings) !=
2086 new_bindings) {
2087 render_view_host_->AllowBindings(new_bindings);
2088 }
2089 } else if (render_view_host_->is_active()) {
2090 // If the ongoing navigation is not to a WebUI or the RenderView is in a
2091 // guest process, ensure that we don't create an unprivileged RenderView in
2092 // a WebUI-enabled process unless it's swapped out.
2093 bool url_acceptable_for_webui =
2094 WebUIControllerFactoryRegistry::GetInstance()->IsURLAcceptableForWebUI(
2095 GetSiteInstance()->GetBrowserContext(), dest_url);
2096 if (!url_acceptable_for_webui) {
2097 CHECK(!ChildProcessSecurityPolicyImpl::GetInstance()->HasWebUIBindings(
2098 GetProcess()->GetID()));
2099 }
2100 }
2101 return prev_web_ui != web_ui_.get();
2102 }
2103
2104 const image_downloader::ImageDownloaderPtr& 2037 const image_downloader::ImageDownloaderPtr&
2105 RenderFrameHostImpl::GetMojoImageDownloader() { 2038 RenderFrameHostImpl::GetMojoImageDownloader() {
2106 if (!mojo_image_downloader_.get() && GetServiceRegistry()) { 2039 if (!mojo_image_downloader_.get() && GetServiceRegistry()) {
2107 GetServiceRegistry()->ConnectToRemoteService( 2040 GetServiceRegistry()->ConnectToRemoteService(
2108 mojo::GetProxy(&mojo_image_downloader_)); 2041 mojo::GetProxy(&mojo_image_downloader_));
2109 } 2042 }
2110 return mojo_image_downloader_; 2043 return mojo_image_downloader_;
2111 } 2044 }
2112 2045
2113 bool RenderFrameHostImpl::IsSameSiteInstance( 2046 bool RenderFrameHostImpl::IsSameSiteInstance(
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
2403 // Copy the common fields. 2336 // Copy the common fields.
2404 *dst = src; 2337 *dst = src;
2405 2338
2406 if (src.routing_id != -1) 2339 if (src.routing_id != -1)
2407 dst->tree_id = RoutingIDToAXTreeID(src.routing_id); 2340 dst->tree_id = RoutingIDToAXTreeID(src.routing_id);
2408 2341
2409 if (src.parent_routing_id != -1) 2342 if (src.parent_routing_id != -1)
2410 dst->parent_tree_id = RoutingIDToAXTreeID(src.parent_routing_id); 2343 dst->parent_tree_id = RoutingIDToAXTreeID(src.parent_routing_id);
2411 } 2344 }
2412 2345
2413 void RenderFrameHostImpl::ResetWebUI() {
2414 web_ui_type_ = WebUI::kNoWebUI;
2415 web_ui_.reset();
2416 }
2417
2418 } // namespace content 2346 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/render_frame_host_impl.h ('k') | content/browser/frame_host/render_frame_host_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698