WeakPtr destruction order cleanup: media edition.

media/filters/ffmpeg_audio_decoder.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_
 #define MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_
 
 #include <list>
 
 #include "base/callback.h"
@@ skipping 50 matching lines @@
   void BufferReady(DemuxerStream::Status status,
                    const scoped_refptr<DecoderBuffer>& input);
 
   bool ConfigureDecoder();
   void ReleaseFFmpegResources();
   void ResetTimestampState();
   void RunDecodeLoop(const scoped_refptr<DecoderBuffer>& input,
                      bool skip_eos_append);
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
-  base::WeakPtrFactory<FFmpegAudioDecoder> weak_factory_;
-  base::WeakPtr<FFmpegAudioDecoder> weak_this_;
 
   DemuxerStream* demuxer_stream_;
   StatisticsCB statistics_cb_;
   scoped_ptr_malloc<AVCodecContext, ScopedPtrAVFreeContext> codec_context_;
 
   // Decoded audio format.
   int bytes_per_channel_;
   ChannelLayout channel_layout_;
   int channels_;
   int samples_per_second_;
@@ skipping 13 matching lines @@
   scoped_ptr_malloc<AVFrame, ScopedPtrAVFreeFrame> av_frame_;
 
   ReadCB read_cb_;
   base::Closure stop_cb_;
   base::Closure reset_cb_;
 
   // Since multiple frames may be decoded from the same packet we need to queue
   // them up and hand them out as we receive Read() calls.
   std::list<QueuedAudioBuffer> queued_audio_;
 
+  // NOTE: These must always be last so they're invalidated before other member
+  // variables might be accessed.
+  base::WeakPtr<FFmpegAudioDecoder> weak_this_;

[Ami GONE FROM CHROMIUM, 2014/03/10 22:02:08]

ditto

+  base::WeakPtrFactory<FFmpegAudioDecoder> weak_factory_;
+
   DISALLOW_IMPLICIT_CONSTRUCTORS(FFmpegAudioDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_