diff options
| author | dalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-18 21:36:22 +0000 |
|---|---|---|
| committer | dalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-18 21:36:22 +0000 |
| commit | de39b02352680506013f3802f75dc95b0eeb694e (patch) | |
| tree | e61ee5cdd4b04736975260544c613b485ce6a670 /media/cast/test/sender.cc | |
| parent | 4dd49e7dd6e6eaa40c16798b4974e006941ccb5e (diff) | |
| download | chromium_src-de39b02352680506013f3802f75dc95b0eeb694e.zip chromium_src-de39b02352680506013f3802f75dc95b0eeb694e.tar.gz chromium_src-de39b02352680506013f3802f75dc95b0eeb694e.tar.bz2 | |
WeakPtr destruction order cleanup: media edition.
Per WeakPtrFactory documentation it must be the first member variable
destructed to avoid invalid member variable access during destruction.
Additional cleanups:
- Removes "weak_this_" usage when there is no manual factory invalidation.
- Adds DISALLOW_COPY_AND_ASSIGN to SendProcess.
- Removes unused WeakPtr from FFmpegVideoDecoder, VpxVideoDecoder, FFMpegAudioDecoder, OpusAudioDecoder
BUG=351048
TEST=compiles, passes CQ.
R=fischman@chromium.org
Review URL: https://codereview.chromium.org/193303002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257765 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/cast/test/sender.cc')
| -rw-r--r-- | media/cast/test/sender.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/media/cast/test/sender.cc b/media/cast/test/sender.cc index 10e48e8..9617bcd 100644 --- a/media/cast/test/sender.cc +++ b/media/cast/test/sender.cc @@ -326,7 +326,11 @@ class SendProcess { base::TimeTicks start_time_; base::TimeTicks send_time_; scoped_ptr<TestAudioBusFactory> audio_bus_factory_; + + // NOTE: Weak pointers must be invalidated before all other member variables. base::WeakPtrFactory<SendProcess> weak_factory_; + + DISALLOW_COPY_AND_ASSIGN(SendProcess); }; } // namespace cast |