Chromium Code Reviews| Index: media/base/text_renderer.h |
| diff --git a/media/base/text_renderer.h b/media/base/text_renderer.h |
| index dab18e6671c64026b0fb8603e0e59a588363bc10..2a515c04538db3be6cfffb2526a80f6edecf11d6 100644 |
| --- a/media/base/text_renderer.h |
| +++ b/media/base/text_renderer.h |
| @@ -105,8 +105,6 @@ class MEDIA_EXPORT TextRenderer { |
| 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(). |
| @@ -140,6 +138,11 @@ class MEDIA_EXPORT TextRenderer { |
| 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); |
| }; |