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

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

Issue 1453803002: Separate RenderViewHost from RenderWidgetHost, part 10: shutdown. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: all in destroy, plus mac 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"
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 // the dtor has run. 265 // the dtor has run.
266 swapout_event_monitor_timeout_.reset(); 266 swapout_event_monitor_timeout_.reset();
267 267
268 for (const auto& iter: visual_state_callbacks_) { 268 for (const auto& iter: visual_state_callbacks_) {
269 iter.second.Run(false); 269 iter.second.Run(false);
270 } 270 }
271 271
272 if (render_widget_host_ && 272 if (render_widget_host_ &&
273 render_widget_host_->owned_by_render_frame_host()) { 273 render_widget_host_->owned_by_render_frame_host()) {
274 // Shutdown causes the RenderWidgetHost to delete itself. 274 // Shutdown causes the RenderWidgetHost to delete itself.
275 render_widget_host_->Shutdown(); 275 render_widget_host_->ShutdownAndDestroyWidget(true);
276 } 276 }
277 277
278 // Notify the FrameTree that this RFH is going away, allowing it to shut down 278 // Notify the FrameTree that this RFH is going away, allowing it to shut down
279 // the corresponding RenderViewHost if it is no longer needed. 279 // the corresponding RenderViewHost if it is no longer needed.
280 frame_tree_->ReleaseRenderViewHostRef(render_view_host_); 280 frame_tree_->ReleaseRenderViewHostRef(render_view_host_);
281 } 281 }
282 282
283 int RenderFrameHostImpl::GetRoutingID() { 283 int RenderFrameHostImpl::GetRoutingID() {
284 return routing_id_; 284 return routing_id_;
285 } 285 }
(...skipping 2193 matching lines...) Expand 10 before | Expand all | Expand 10 after
2479 *dst = src; 2479 *dst = src;
2480 2480
2481 if (src.routing_id != -1) 2481 if (src.routing_id != -1)
2482 dst->tree_id = RoutingIDToAXTreeID(src.routing_id); 2482 dst->tree_id = RoutingIDToAXTreeID(src.routing_id);
2483 2483
2484 if (src.parent_routing_id != -1) 2484 if (src.parent_routing_id != -1)
2485 dst->parent_tree_id = RoutingIDToAXTreeID(src.parent_routing_id); 2485 dst->parent_tree_id = RoutingIDToAXTreeID(src.parent_routing_id);
2486 } 2486 }
2487 2487
2488 } // namespace content 2488 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698