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

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

Issue 1007123003: Clear RenderFrameImpl::frame_ pointer after deleting it. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Verify OnMessageReceived returns false 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 720 matching lines...) Expand 10 before | Expand all | Expand 10 after
731 media::MediaPermission* media_permission, 731 media::MediaPermission* media_permission,
732 blink::WebContentDecryptionModule* initial_cdm); 732 blink::WebContentDecryptionModule* initial_cdm);
733 733
734 RendererMediaPlayerManager* GetMediaPlayerManager(); 734 RendererMediaPlayerManager* GetMediaPlayerManager();
735 #endif 735 #endif
736 736
737 #if defined(ENABLE_BROWSER_CDMS) 737 #if defined(ENABLE_BROWSER_CDMS)
738 RendererCdmManager* GetCdmManager(); 738 RendererCdmManager* GetCdmManager();
739 #endif 739 #endif
740 740
741 // Stores the WebLocalFrame we are associated with. 741 // Stores the WebLocalFrame we are associated with. This is null from the
742 // constructor until SetWebFrame is called, and it is null after
743 // frameDetached is called until destruction (which is asynchronous in the
744 // case of the main frame, but not subframes).
742 blink::WebLocalFrame* frame_; 745 blink::WebLocalFrame* frame_;
743 746
744 base::WeakPtr<RenderViewImpl> render_view_; 747 base::WeakPtr<RenderViewImpl> render_view_;
745 int routing_id_; 748 int routing_id_;
746 bool is_swapped_out_; 749 bool is_swapped_out_;
747 // RenderFrameProxy exists only when is_swapped_out_ is true. 750 // RenderFrameProxy exists only when is_swapped_out_ is true.
748 // TODO(nasko): This can be removed once we don't have a swapped out state on 751 // TODO(nasko): This can be removed once we don't have a swapped out state on
749 // RenderFrame. See https://crbug.com/357747. 752 // RenderFrame. See https://crbug.com/357747.
750 RenderFrameProxy* render_frame_proxy_; 753 RenderFrameProxy* render_frame_proxy_;
751 bool is_detaching_; 754 bool is_detaching_;
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
881 #endif 884 #endif
882 885
883 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 886 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
884 887
885 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 888 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
886 }; 889 };
887 890
888 } // namespace content 891 } // namespace content
889 892
890 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 893 #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