WeakPtr destruction order cleanup: media edition.

content/renderer/media/android/media_source_delegate.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 CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
 #define CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 164 matching lines @@
   bool IsSeeking() const;
 
   // Returns |seek_time| if it is still buffered or if there is no currently
   // buffered range including or soon after |seek_time|. If |seek_time| is not
   // buffered, but there is a later range buffered near to |seek_time|, returns
   // next buffered range's start time instead. Only call this for browser seeks.
   // |seeking_lock_| must be held by caller.
   base::TimeDelta FindBufferedBrowserSeekTime_Locked(
       const base::TimeDelta& seek_time) const;
 
-  // Message loop for main renderer thread and corresponding weak pointer.
-  const scoped_refptr<base::MessageLoopProxy> main_loop_;
-  base::WeakPtrFactory<MediaSourceDelegate> main_weak_factory_;
-  base::WeakPtr<MediaSourceDelegate> main_weak_this_;
-
-  // Message loop for media thread and corresponding weak pointer.
-  const scoped_refptr<base::MessageLoopProxy> media_loop_;
-  base::WeakPtrFactory<MediaSourceDelegate> media_weak_factory_;
-
   RendererDemuxerAndroid* demuxer_client_;
   int demuxer_client_id_;
 
   scoped_refptr<media::MediaLog> media_log_;
   UpdateNetworkStateCB update_network_state_cb_;
   DurationChangeCB duration_change_cb_;
 
   scoped_ptr<media::ChunkDemuxer> chunk_demuxer_;
   bool is_demuxer_ready_;
 
@@ skipping 29 matching lines @@
   // not a regular seek is expected soon. If a regular seek is expected soon,
   // then any in-progress browser seek will be canceled pending the
   // regular seek, if using |chunk_demuxer_|, and any requested browser seek
   // will be trivially finished. Access is serialized by |seeking_lock_|.
   bool doing_browser_seek_;
   base::TimeDelta browser_seek_time_;
   bool expecting_regular_seek_;
 
   size_t access_unit_size_;
 
+  // Message loop for main renderer and media threads.
+  const scoped_refptr<base::MessageLoopProxy> main_loop_;
+  const scoped_refptr<base::MessageLoopProxy> media_loop_;
+
+  // NOTE: These must always be last so they're invalidated before other member
+  // variables might be accessed.
+  base::WeakPtr<MediaSourceDelegate> main_weak_this_;

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

This reversal (putting the factory _after_ a ptr vended from it) looks weird to
me.  Flip them back?

[DaleCurtis, 2014/03/10 23:47:46]

Done.

+  base::WeakPtrFactory<MediaSourceDelegate> main_weak_factory_;
+  base::WeakPtrFactory<MediaSourceDelegate> media_weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(MediaSourceDelegate);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_