diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-03-21 14:25:57 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-03-21 14:25:57 +0000 |
| commit | 23730a6e56a168d1879203e4b3819bb36e3d8f1f (patch) | |
| tree | 4b72bdd217f9beda1d1b975e21c9d646a9664c48 /media/audio/alsa/alsa_output.h | |
| parent | 6d6d338a36340632714f2aab9a266979b71c3442 (diff) | |
| download | chromium_org-23730a6e56a168d1879203e4b3819bb36e3d8f1f.tar.gz | |
Merge from Chromium at DEPS revision 258528
This commit was generated by merge_to_master.py.
Change-Id: Id197cbdde2c2881915f096c0426c741416884783
Diffstat (limited to 'media/audio/alsa/alsa_output.h')
| -rw-r--r-- | media/audio/alsa/alsa_output.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/media/audio/alsa/alsa_output.h b/media/audio/alsa/alsa_output.h index 65a23f7512..180564584c 100644 --- a/media/audio/alsa/alsa_output.h +++ b/media/audio/alsa/alsa_output.h @@ -201,10 +201,6 @@ class MEDIA_EXPORT AlsaPcmOutputStream : public AudioOutputStream { scoped_ptr<media::SeekableBuffer> buffer_; uint32 frames_per_packet_; - // Allows us to run tasks on the AlsaPcmOutputStream instance which are - // bound by its lifetime. - base::WeakPtrFactory<AlsaPcmOutputStream> weak_factory_; - InternalState state_; float volume_; // Volume level from 0.0 to 1.0. @@ -217,6 +213,11 @@ class MEDIA_EXPORT AlsaPcmOutputStream : public AudioOutputStream { scoped_ptr<ChannelMixer> channel_mixer_; scoped_ptr<AudioBus> mixed_audio_bus_; + // Allows us to run tasks on the AlsaPcmOutputStream instance which are + // bound by its lifetime. + // NOTE: Weak pointers must be invalidated before all other member variables. + base::WeakPtrFactory<AlsaPcmOutputStream> weak_factory_; + DISALLOW_COPY_AND_ASSIGN(AlsaPcmOutputStream); }; |