WeakPtr destruction order cleanup: media edition.

media/base/android/media_decoder_job.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_ANDROID_MEDIA_DECODER_JOB_H_
 #define MEDIA_BASE_ANDROID_MEDIA_DECODER_JOB_H_
 
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
@@ skipping 152 matching lines @@
   // is not very accurate.
   base::TimeDelta preroll_timestamp_;
 
   // Indicates prerolling state. If true, this job has not yet decoded output
   // that it will render, since the most recent of job construction or
   // BeginPrerolling(). If false, |preroll_timestamp_| has been reached.
   // TODO(qinmin): Comparing access unit's timestamp with |preroll_timestamp_|
   // 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_;
 
   // Callback to run when new data has been received.
   base::Closure on_data_received_cb_;
 
   // Callback to run when the current Decode() operation completes.
   DecoderCallback decode_cb_;
 
   // The current access unit being processed.
   size_t access_unit_index_;
 
   // Data received over IPC from last RequestData() operation.
   DemuxerData received_data_;
 
   // The index of input buffer that can be used by QueueInputBuffer().
   // If the index is uninitialized or invalid, it must be -1.
   int input_buf_index_;
 
   bool stop_decode_pending_;
 
   // Indicates that this object should be destroyed once the current
   // Decode() has completed. This gets set when Release() gets called
   // 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: Weak pointers must be invalidated before all other member variables.
+  base::WeakPtrFactory<MediaDecoderJob> weak_factory_;
+
   DISALLOW_IMPLICIT_CONSTRUCTORS(MediaDecoderJob);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_DECODER_JOB_H_