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

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

Issue 1021313002: Clear RenderFrameImpl::frame_ pointer after deleting it. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2272
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 689 matching lines...) Expand 10 before | Expand all | Expand 10 after
700 blink::WebMediaPlayerClient* client, 700 blink::WebMediaPlayerClient* client,
701 blink::WebContentDecryptionModule* initial_cdm); 701 blink::WebContentDecryptionModule* initial_cdm);
702 702
703 RendererMediaPlayerManager* GetMediaPlayerManager(); 703 RendererMediaPlayerManager* GetMediaPlayerManager();
704 #endif 704 #endif
705 705
706 #if defined(ENABLE_BROWSER_CDMS) 706 #if defined(ENABLE_BROWSER_CDMS)
707 RendererCdmManager* GetCdmManager(); 707 RendererCdmManager* GetCdmManager();
708 #endif 708 #endif
709 709
710 // Stores the WebLocalFrame we are associated with. 710 // Stores the WebLocalFrame we are associated with. This is null from the
711 // constructor until SetWebFrame is called, and it is null after
712 // frameDetached is called until destruction (which is asynchronous in the
713 // case of the main frame, but not subframes).
711 blink::WebLocalFrame* frame_; 714 blink::WebLocalFrame* frame_;
712 715
713 base::WeakPtr<RenderViewImpl> render_view_; 716 base::WeakPtr<RenderViewImpl> render_view_;
714 int routing_id_; 717 int routing_id_;
715 bool is_swapped_out_; 718 bool is_swapped_out_;
716 // RenderFrameProxy exists only when is_swapped_out_ is true. 719 // RenderFrameProxy exists only when is_swapped_out_ is true.
717 // TODO(nasko): This can be removed once we don't have a swapped out state on 720 // TODO(nasko): This can be removed once we don't have a swapped out state on
718 // RenderFrame. See https://crbug.com/357747. 721 // RenderFrame. See https://crbug.com/357747.
719 RenderFrameProxy* render_frame_proxy_; 722 RenderFrameProxy* render_frame_proxy_;
720 bool is_detaching_; 723 bool is_detaching_;
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
836 #endif 839 #endif
837 840
838 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 841 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
839 842
840 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 843 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
841 }; 844 };
842 845
843 } // namespace content 846 } // namespace content
844 847
845 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 848 #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