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

Side by Side Diff: content/renderer/render_frame_impl.h

Issue 1002493004: Clear RenderFrameImpl::frame_ pointer after deleting it. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2311
Patch Set: Created 5 years, 9 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
« no previous file with comments | « no previous file | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_RENDERER_RENDER_FRAME_IMPL_H_ 5 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 708 matching lines...) Expand 10 before | Expand all | Expand 10 after
719 media::MediaPermission* media_permission, 719 media::MediaPermission* media_permission,
720 blink::WebContentDecryptionModule* initial_cdm); 720 blink::WebContentDecryptionModule* initial_cdm);
721 721
722 RendererMediaPlayerManager* GetMediaPlayerManager(); 722 RendererMediaPlayerManager* GetMediaPlayerManager();
723 #endif 723 #endif
724 724
725 #if defined(ENABLE_BROWSER_CDMS) 725 #if defined(ENABLE_BROWSER_CDMS)
726 RendererCdmManager* GetCdmManager(); 726 RendererCdmManager* GetCdmManager();
727 #endif 727 #endif
728 728
729 // Stores the WebLocalFrame we are associated with. 729 // Stores the WebLocalFrame we are associated with. This is null from the
730 // constructor until SetWebFrame is called, and it is null after
731 // frameDetached is called until destruction (which is asynchronous in the
732 // case of the main frame, but not subframes).
730 blink::WebLocalFrame* frame_; 733 blink::WebLocalFrame* frame_;
731 734
732 base::WeakPtr<RenderViewImpl> render_view_; 735 base::WeakPtr<RenderViewImpl> render_view_;
733 int routing_id_; 736 int routing_id_;
734 bool is_swapped_out_; 737 bool is_swapped_out_;
735 // RenderFrameProxy exists only when is_swapped_out_ is true. 738 // RenderFrameProxy exists only when is_swapped_out_ is true.
736 // TODO(nasko): This can be removed once we don't have a swapped out state on 739 // TODO(nasko): This can be removed once we don't have a swapped out state on
737 // RenderFrame. See https://crbug.com/357747. 740 // RenderFrame. See https://crbug.com/357747.
738 RenderFrameProxy* render_frame_proxy_; 741 RenderFrameProxy* render_frame_proxy_;
739 bool is_detaching_; 742 bool is_detaching_;
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
869 #endif 872 #endif
870 873
871 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 874 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
872 875
873 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 876 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
874 }; 877 };
875 878
876 } // namespace content 879 } // namespace content
877 880
878 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 881 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698