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

Unified Diff: media/filters/audio_renderer_impl.h

Issue 12262058: Revert r180578, r180591, and r180604 from 1410 branch. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1410/src/
Patch Set: Created 7 years, 10 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 | « media/base/video_renderer.h ('k') | media/filters/audio_renderer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/audio_renderer_impl.h
===================================================================
--- media/filters/audio_renderer_impl.h (revision 182591)
+++ media/filters/audio_renderer_impl.h (working copy)
@@ -22,7 +22,6 @@
#include <deque>
#include "base/gtest_prod_util.h"
-#include "base/memory/weak_ptr.h"
#include "base/synchronization/lock.h"
#include "media/base/audio_decoder.h"
#include "media/base/audio_renderer.h"
@@ -48,7 +47,6 @@
AudioRendererImpl(const scoped_refptr<base::MessageLoopProxy>& message_loop,
AudioRendererSink* sink,
const SetDecryptorReadyCB& set_decryptor_ready_cb);
- virtual ~AudioRendererImpl();
// AudioRenderer implementation.
virtual void Initialize(const scoped_refptr<DemuxerStream>& stream,
@@ -82,6 +80,9 @@
now_cb_ = now_cb;
}
+ protected:
+ virtual ~AudioRendererImpl();
+
private:
friend class AudioRendererImplTest;
@@ -159,8 +160,6 @@
void ResetDecoder(const base::Closure& callback);
scoped_refptr<base::MessageLoopProxy> message_loop_;
- base::WeakPtrFactory<AudioRendererImpl> weak_factory_;
- base::WeakPtr<AudioRendererImpl> weak_this_;
scoped_ptr<AudioSplicer> splicer_;
« no previous file with comments | « media/base/video_renderer.h ('k') | media/filters/audio_renderer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698