WeakPtr destruction order cleanup: media edition.

media/base/text_renderer.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_BASE_TEXT_RENDERER_H_
 #define MEDIA_BASE_TEXT_RENDERER_H_
 
 #include <map>
 #include <set>
 
@@ skipping 87 matching lines @@
 
   // Dispatched when the AddTextTrackCB completes, after having created
   // the TextTrack object associated with |text_stream|.
   void OnAddTextTrackDone(DemuxerStream* text_stream,
                           scoped_ptr<TextTrack> text_track);
 
   // Utility function to post a read request on |text_stream|.
   void Read(TextTrackState* state, DemuxerStream* text_stream);
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
-  base::WeakPtrFactory<TextRenderer> weak_factory_;
-  base::WeakPtr<TextRenderer> weak_this_;
   const AddTextTrackCB add_text_track_cb_;
 
   // Callbacks provided during Initialize().
   base::Closure ended_cb_;
 
   // Callback provided to Pause().
   base::Closure pause_cb_;
 
   // Callback provided to Stop().
   base::Closure stop_cb_;
@@ skipping 13 matching lines @@
   typedef std::map<DemuxerStream*, TextTrackState*> TextTrackStateMap;
   TextTrackStateMap text_track_state_map_;
 
   // Indicates how many read requests are in flight.
   int pending_read_count_;
 
   // Indicates which text streams have not delivered end-of-stream yet.
   typedef std::set<DemuxerStream*> PendingEosSet;
   PendingEosSet pending_eos_set_;
 
+  // NOTE: These must always be last so they're invalidated before other member
+  // variables might be accessed.
+  base::WeakPtr<TextRenderer> weak_this_;

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

ditto

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