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

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

Issue 1052223008: Shutdown RenderWidgetHost owned by RenderFrameHost when destroying the RenderFrameHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 months 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 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 605 matching lines...) Expand 10 before | Expand all | Expand 10 after
616 // ExecuteJavaScript and their corresponding callbacks. 616 // ExecuteJavaScript and their corresponding callbacks.
617 std::map<int, JavaScriptResultCallback> javascript_callbacks_; 617 std::map<int, JavaScriptResultCallback> javascript_callbacks_;
618 std::map<uint64, VisualStateCallback> visual_state_callbacks_; 618 std::map<uint64, VisualStateCallback> visual_state_callbacks_;
619 619
620 // RenderFrameHosts that need management of the rendering and input events 620 // RenderFrameHosts that need management of the rendering and input events
621 // for their frame subtrees require RenderWidgetHosts. This typically 621 // for their frame subtrees require RenderWidgetHosts. This typically
622 // means frames that are rendered in different processes from their parent 622 // means frames that are rendered in different processes from their parent
623 // frames. 623 // frames.
624 // TODO(kenrb): Later this will also be used on the top-level frame, when 624 // TODO(kenrb): Later this will also be used on the top-level frame, when
625 // RenderFrameHost owns its RenderViewHost. 625 // RenderFrameHost owns its RenderViewHost.
626 scoped_ptr<RenderWidgetHostImpl> render_widget_host_; 626 RenderWidgetHostImpl* render_widget_host_;
627 627
628 int routing_id_; 628 int routing_id_;
629 629
630 // The current state of this RenderFrameHost. 630 // The current state of this RenderFrameHost.
631 RenderFrameHostImplState rfh_state_; 631 RenderFrameHostImplState rfh_state_;
632 632
633 // Tracks whether the RenderFrame for this RenderFrameHost has been created in 633 // Tracks whether the RenderFrame for this RenderFrameHost has been created in
634 // the renderer process. Currently only used for subframes. 634 // the renderer process. Currently only used for subframes.
635 // TODO(creis): Use this for main frames as well when RVH goes away. 635 // TODO(creis): Use this for main frames as well when RVH goes away.
636 bool render_frame_created_; 636 bool render_frame_created_;
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
722 722
723 // NOTE: This must be the last member. 723 // NOTE: This must be the last member.
724 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_; 724 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_;
725 725
726 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl); 726 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl);
727 }; 727 };
728 728
729 } // namespace content 729 } // namespace content
730 730
731 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 731 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698