WeakPtr destruction order cleanup: media edition.

media/filters/ffmpeg_video_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_VIDEO_DECODER_H_
 #define MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_
 
 #include <list>
 
 #include "base/callback.h"
@@ skipping 54 matching lines @@
   bool ConfigureDecoder();
 
   // Releases resources associated with |codec_context_| and |av_frame_|
   // and resets them to NULL.
   void ReleaseFFmpegResources();
 
   // Reset decoder and call |reset_cb_|.
   void DoReset();
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
-  base::WeakPtrFactory<FFmpegVideoDecoder> weak_factory_;
-  base::WeakPtr<FFmpegVideoDecoder> weak_this_;
 
   DecoderState state_;
 
   DecodeCB decode_cb_;
   base::Closure reset_cb_;
 
   // FFmpeg structures owned by this object.
   scoped_ptr_malloc<AVCodecContext, ScopedPtrAVFreeContext> codec_context_;
   scoped_ptr_malloc<AVFrame, ScopedPtrAVFreeFrame> av_frame_;
 
   VideoDecoderConfig config_;
 
   VideoFramePool frame_pool_;
 
+  // NOTE: These must always be last so they're invalidated before other member
+  // variables might be accessed.
+  base::WeakPtr<FFmpegVideoDecoder> weak_this_;

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

ditto

+  base::WeakPtrFactory<FFmpegVideoDecoder> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(FFmpegVideoDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_