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/filters/fake_video_decoder.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/filters/fake_video_decoder.h')
| -rw-r--r-- | media/filters/fake_video_decoder.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/media/filters/fake_video_decoder.h b/media/filters/fake_video_decoder.h index 417c83e783..3da6989eee 100644 --- a/media/filters/fake_video_decoder.h +++ b/media/filters/fake_video_decoder.h @@ -74,8 +74,6 @@ class FakeVideoDecoder : public VideoDecoder { void DoStop(); scoped_refptr<base::SingleThreadTaskRunner> task_runner_; - base::WeakPtrFactory<FakeVideoDecoder> weak_factory_; - base::WeakPtr<FakeVideoDecoder> weak_this_; const int decoding_delay_; @@ -94,6 +92,9 @@ class FakeVideoDecoder : public VideoDecoder { int total_bytes_decoded_; + // NOTE: Weak pointers must be invalidated before all other member variables. + base::WeakPtrFactory<FakeVideoDecoder> weak_factory_; + DISALLOW_COPY_AND_ASSIGN(FakeVideoDecoder); }; |