WeakPtr destruction order cleanup: media edition.

media/filters/video_renderer_impl.h

 // Copyright 2013 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_VIDEO_RENDERER_IMPL_H_
 #define MEDIA_FILTERS_VIDEO_RENDERER_IMPL_H_
 
 #include <deque>
 
 #include "base/memory/ref_counted.h"
@@ skipping 119 matching lines @@
   // Returns true of all conditions have been met to transition from
   // kPrerolling to kPrerolled.
   bool ShouldTransitionToPrerolled_Locked();
 
   // Runs |statistics_cb_| with |frames_decoded_| and |frames_dropped_|, resets
   // them to 0, and then waits on |frame_available_| for up to the
   // |wait_duration|.
   void UpdateStatsAndWait_Locked(base::TimeDelta wait_duration);
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
-  base::WeakPtrFactory<VideoRendererImpl> weak_factory_;
-  base::WeakPtr<VideoRendererImpl> weak_this_;
 
   // Used for accessing data members.
   base::Lock lock_;
 
   // Provides video frames to VideoRendererImpl.
   VideoFrameStream video_frame_stream_;
 
   // Queue of incoming frames yet to be painted.
   typedef std::deque<scoped_refptr<VideoFrame> > VideoFrameQueue;
   VideoFrameQueue ready_frames_;
@@ skipping 81 matching lines @@
   // The timestamp of the last frame removed from the |ready_frames_| queue,
   // either for calling |paint_cb_| or for dropping. Set to kNoTimestamp()
   // during flushing.
   base::TimeDelta last_timestamp_;
 
   // Keeps track of the number of frames decoded and dropped since the
   // last call to |statistics_cb_|. These must be accessed under lock.
   int frames_decoded_;
   int frames_dropped_;
 
+  // NOTE: These must always be last so they're invalidated before other member
+  // variables might be accessed.
+  base::WeakPtr<VideoRendererImpl> weak_this_;

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

ditto

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