| Index: media/base/android/media_decoder_job.h
|
| diff --git a/media/base/android/media_decoder_job.h b/media/base/android/media_decoder_job.h
|
| index 286d27cf75b5c60251085d7000764736f7a8fd6a..b7e9c5a59cea49046cc7d9bd607f6d00341f8eb1 100644
|
| --- a/media/base/android/media_decoder_job.h
|
| +++ b/media/base/android/media_decoder_job.h
|
| @@ -170,10 +170,6 @@ class MediaDecoderJob {
|
| // is not very accurate.
|
| bool prerolling_;
|
|
|
| - // Weak pointer passed to media decoder jobs for callbacks. It is bounded to
|
| - // the decoder thread.
|
| - base::WeakPtrFactory<MediaDecoderJob> weak_this_;
|
| -
|
| // Callback used to request more data.
|
| base::Closure request_data_cb_;
|
|
|
| @@ -200,6 +196,11 @@ class MediaDecoderJob {
|
| // while there is a decode in progress.
|
| bool destroy_pending_;
|
|
|
| + // Weak pointer passed to media decoder jobs for callbacks. It is bounded to
|
| + // the decoder thread. NOTE: This must always be last so it's invalidated
|
| + // before other member variables might be accessed.
|
| + base::WeakPtrFactory<MediaDecoderJob> weak_factory_;
|
| +
|
| DISALLOW_IMPLICIT_CONSTRUCTORS(MediaDecoderJob);
|
| };
|
|
|
|
|