Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(393)

Unified Diff: trunk/src/media/filters/decrypting_video_decoder.h

Issue 14320005: Revert 194993 "Remove reference counting from media::VideoDecode..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/media/base/video_renderer.h ('k') | trunk/src/media/filters/decrypting_video_decoder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/media/filters/decrypting_video_decoder.h
===================================================================
--- trunk/src/media/filters/decrypting_video_decoder.h (revision 195011)
+++ trunk/src/media/filters/decrypting_video_decoder.h (working copy)
@@ -6,7 +6,7 @@
#define MEDIA_FILTERS_DECRYPTING_VIDEO_DECODER_H_
#include "base/callback.h"
-#include "base/memory/weak_ptr.h"
+#include "base/memory/ref_counted.h"
#include "media/base/decryptor.h"
#include "media/base/demuxer_stream.h"
#include "media/base/video_decoder.h"
@@ -34,7 +34,6 @@
DecryptingVideoDecoder(
const scoped_refptr<base::MessageLoopProxy>& message_loop,
const SetDecryptorReadyCB& set_decryptor_ready_cb);
- virtual ~DecryptingVideoDecoder();
// VideoDecoder implementation.
virtual void Initialize(const scoped_refptr<DemuxerStream>& stream,
@@ -44,6 +43,9 @@
virtual void Reset(const base::Closure& closure) OVERRIDE;
virtual void Stop(const base::Closure& closure) OVERRIDE;
+ protected:
+ virtual ~DecryptingVideoDecoder();
+
private:
// For a detailed state diagram please see this link: http://goo.gl/8jAok
// TODO(xhwang): Add a ASCII state diagram in this file after this class
@@ -94,8 +96,6 @@
void DoStop();
scoped_refptr<base::MessageLoopProxy> message_loop_;
- base::WeakPtrFactory<DecryptingVideoDecoder> weak_factory_;
- base::WeakPtr<DecryptingVideoDecoder> weak_this_;
State state_;
« no previous file with comments | « trunk/src/media/base/video_renderer.h ('k') | trunk/src/media/filters/decrypting_video_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698