| Index: webrtc/base/sequenced_task_checker.h
|
| diff --git a/webrtc/base/sequenced_task_checker.h b/webrtc/base/sequenced_task_checker.h
|
| index 4df5b5420cd4321169351a37103bd520d9c793ec..e586b8d6daea22b1555e198eca058d61bf4991f1 100644
|
| --- a/webrtc/base/sequenced_task_checker.h
|
| +++ b/webrtc/base/sequenced_task_checker.h
|
| @@ -11,68 +11,9 @@
|
| #ifndef WEBRTC_BASE_SEQUENCED_TASK_CHECKER_H_
|
| #define WEBRTC_BASE_SEQUENCED_TASK_CHECKER_H_
|
|
|
| -// Apart from debug builds, we also enable the sequence checker in
|
| -// builds with RTC_DCHECK_IS_ON so that trybots and waterfall bots
|
| -// with this define will get the same level of checking as debug bots.
|
| -#define ENABLE_SEQUENCED_TASK_CHECKER RTC_DCHECK_IS_ON
|
|
|
| -#include "webrtc/base/checks.h"
|
| -#include "webrtc/base/constructormagic.h"
|
| -#include "webrtc/base/thread_annotations.h"
|
| -#include "webrtc/base/sequenced_task_checker_impl.h"
|
| +// This header is deprecated and is just left here temporarily during
|
| +// refactoring. See https://bugs.webrtc.org/7634 for more details.
|
| +#include "webrtc/rtc_base/sequenced_task_checker.h"
|
|
|
| -namespace rtc {
|
| -
|
| -// Do nothing implementation, for use in release mode.
|
| -//
|
| -// Note: You should almost always use the SequencedTaskChecker class to get the
|
| -// right version for your build configuration.
|
| -class SequencedTaskCheckerDoNothing {
|
| - public:
|
| - bool CalledSequentially() const { return true; }
|
| -
|
| - void Detach() {}
|
| -};
|
| -
|
| -// SequencedTaskChecker is a helper class used to help verify that some methods
|
| -// of a class are called on the same task queue or thread. A
|
| -// SequencedTaskChecker is bound to a a task queue if the object is
|
| -// created on a task queue, or a thread otherwise.
|
| -//
|
| -//
|
| -// Example:
|
| -// class MyClass {
|
| -// public:
|
| -// void Foo() {
|
| -// RTC_DCHECK(sequence_checker_.CalledSequentially());
|
| -// ... (do stuff) ...
|
| -// }
|
| -//
|
| -// private:
|
| -// SequencedTaskChecker sequence_checker_;
|
| -// }
|
| -//
|
| -// In Release mode, CalledOnValidThread will always return true.
|
| -#if ENABLE_SEQUENCED_TASK_CHECKER
|
| -class LOCKABLE SequencedTaskChecker : public SequencedTaskCheckerImpl {};
|
| -#else
|
| -class LOCKABLE SequencedTaskChecker : public SequencedTaskCheckerDoNothing {};
|
| -#endif // ENABLE_SEQUENCED_TASK_CHECKER_H_
|
| -
|
| -namespace internal {
|
| -class SCOPED_LOCKABLE SequencedTaskCheckerScope {
|
| - public:
|
| - explicit SequencedTaskCheckerScope(const SequencedTaskChecker* checker)
|
| - EXCLUSIVE_LOCK_FUNCTION(checker);
|
| - ~SequencedTaskCheckerScope() UNLOCK_FUNCTION();
|
| -};
|
| -
|
| -} // namespace internal
|
| -
|
| -#define RTC_DCHECK_CALLED_SEQUENTIALLY(x) \
|
| - rtc::internal::SequencedTaskCheckerScope checker(x)
|
| -
|
| -#undef ENABLE_SEQUENCED_TASK_CHECKER
|
| -
|
| -} // namespace rtc
|
| #endif // WEBRTC_BASE_SEQUENCED_TASK_CHECKER_H_
|
|
|