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

Unified Diff: content/renderer/media/webrtc_audio_renderer.h

Issue 2909103002: Deprecate NonThreadSafe in content/renderer/media in favor of SequenceChecker. (Closed)
Patch Set: fix compile Created 3 years, 7 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
Index: content/renderer/media/webrtc_audio_renderer.h
diff --git a/content/renderer/media/webrtc_audio_renderer.h b/content/renderer/media/webrtc_audio_renderer.h
index f6e1a4614a8cb07e8d57f47a09740543adeeb890..c8d99d04f19c0221aaefb27dadce5925148c70da 100644
--- a/content/renderer/media/webrtc_audio_renderer.h
+++ b/content/renderer/media/webrtc_audio_renderer.h
@@ -14,9 +14,9 @@
#include "base/macros.h"
#include "base/memory/ref_counted.h"
+#include "base/sequence_checker.h"
#include "base/single_thread_task_runner.h"
#include "base/synchronization/lock.h"
-#include "base/threading/non_thread_safe.h"
#include "base/threading/thread_checker.h"
#include "content/public/renderer/media_stream_audio_renderer.h"
#include "content/renderer/media/webrtc_audio_device_impl.h"
@@ -45,33 +45,37 @@ class CONTENT_EXPORT WebRtcAudioRenderer
// It is used by both WebRtcAudioRenderer and SharedAudioRenderer (see cc
// file) so a part of why it exists is to avoid code duplication and track
// the state in the same way in WebRtcAudioRenderer and SharedAudioRenderer.
- class PlayingState : public base::NonThreadSafe {
+ class PlayingState {
public:
PlayingState() : playing_(false), volume_(1.0f) {}
+ ~PlayingState() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); }
+
bool playing() const {
- DCHECK(CalledOnValidThread());
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
return playing_;
}
void set_playing(bool playing) {
- DCHECK(CalledOnValidThread());
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
playing_ = playing;
}
float volume() const {
- DCHECK(CalledOnValidThread());
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
return volume_;
}
void set_volume(float volume) {
- DCHECK(CalledOnValidThread());
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
volume_ = volume;
}
private:
bool playing_;
float volume_;
+
+ SEQUENCE_CHECKER(sequence_checker_);
};
WebRtcAudioRenderer(

Powered by Google App Engine
This is Rietveld 408576698