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

Unified Diff: media/filters/ffmpeg_demuxer.h

Issue 193303002: WeakPtr destruction order cleanup: media edition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/ffmpeg_audio_decoder.cc ('k') | media/filters/ffmpeg_demuxer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_demuxer.h
diff --git a/media/filters/ffmpeg_demuxer.h b/media/filters/ffmpeg_demuxer.h
index 6445ed7876e0212d5eb892b01f3bc4bbc34172d9..6068e0d90038641485a85de5c2da0fbe4120b255 100644
--- a/media/filters/ffmpeg_demuxer.h
+++ b/media/filters/ffmpeg_demuxer.h
@@ -205,8 +205,6 @@ class MEDIA_EXPORT FFmpegDemuxer : public Demuxer {
DemuxerHost* host_;
scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
- base::WeakPtrFactory<FFmpegDemuxer> weak_factory_;
- base::WeakPtr<FFmpegDemuxer> weak_this_;
// Thread on which all blocking FFmpeg operations are executed.
base::Thread blocking_thread_;
@@ -264,6 +262,9 @@ class MEDIA_EXPORT FFmpegDemuxer : public Demuxer {
const NeedKeyCB need_key_cb_;
+ // NOTE: Weak pointers must be invalidated before all other member variables.
+ base::WeakPtrFactory<FFmpegDemuxer> weak_factory_;
+
DISALLOW_COPY_AND_ASSIGN(FFmpegDemuxer);
};
« no previous file with comments | « media/filters/ffmpeg_audio_decoder.cc ('k') | media/filters/ffmpeg_demuxer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698