| Index: media/filters/decrypting_video_decoder.h
|
| diff --git a/media/filters/decrypting_video_decoder.h b/media/filters/decrypting_video_decoder.h
|
| index f0fd27ac757be241a48513a2947f7fcca5c6217a..89c72c2851a767bd72d7c5c64da151a0152a1e9a 100644
|
| --- a/media/filters/decrypting_video_decoder.h
|
| +++ b/media/filters/decrypting_video_decoder.h
|
| @@ -79,8 +79,6 @@ class MEDIA_EXPORT DecryptingVideoDecoder : public VideoDecoder {
|
| void DoStop();
|
|
|
| scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
|
| - base::WeakPtrFactory<DecryptingVideoDecoder> weak_factory_;
|
| - base::WeakPtr<DecryptingVideoDecoder> weak_this_;
|
|
|
| State state_;
|
|
|
| @@ -109,6 +107,10 @@ class MEDIA_EXPORT DecryptingVideoDecoder : public VideoDecoder {
|
| // matching DecryptCB call (in DoDeliverFrame()).
|
| uint32 trace_id_;
|
|
|
| + // NOTE: Weak pointers must be invalidated before all other member variables.
|
| + base::WeakPtrFactory<DecryptingVideoDecoder> weak_factory_;
|
| + base::WeakPtr<DecryptingVideoDecoder> weak_this_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(DecryptingVideoDecoder);
|
| };
|
|
|
|
|