Chromium Code Reviews| Index: base/memory/weak_ptr.cc |
| diff --git a/base/memory/weak_ptr.cc b/base/memory/weak_ptr.cc |
| index a22f61aa2ba47e0a8417e40734a23353c96b2eb6..1411a133a324337280b92a7359e5397a61e17900 100644 |
| --- a/base/memory/weak_ptr.cc |
| +++ b/base/memory/weak_ptr.cc |
| @@ -10,21 +10,23 @@ namespace internal { |
| WeakReference::Flag::Flag() : is_valid_(true) { |
| // Flags only become bound when checked for validity, or invalidated, |
| // so that we can check that later validity/invalidation operations on |
| - // the same Flag take place on the same thread. |
| - thread_checker_.DetachFromThread(); |
| + // the same Flag take place on the same sequence. |
| + sequence_checker_.DetachFromSequence(); |
| } |
| void WeakReference::Flag::Invalidate() { |
| // The flag being invalidated with a single ref implies that there are no |
| // weak pointers in existence. Allow deletion on other thread in this case. |
| - DCHECK(thread_checker_.CalledOnValidThread() || HasOneRef()) |
| - << "WeakPtrs must be checked and invalidated on the same thread."; |
| + DCHECK(sequence_checker_.CalledOnValidSequencedThread() || HasOneRef()) |
| + << "WeakPtrs must be checked and invalidated on the same sequenced " |
|
akalin
2013/07/12 01:09:21
may as well do "checked and invalidated" -> "inval
tommycli
2013/07/12 19:16:25
Done.
|
| + << "thread."; |
| is_valid_ = false; |
| } |
| bool WeakReference::Flag::IsValid() const { |
| - DCHECK(thread_checker_.CalledOnValidThread()) |
| - << "WeakPtrs must be checked and invalidated on the same thread."; |
| + DCHECK(sequence_checker_.CalledOnValidSequencedThread()) |
| + << "WeakPtrs must be checked and invalidated on the same sequenced " |
|
akalin
2013/07/12 01:09:21
and "checked and invalidated" -> "checked" here
tommycli
2013/07/12 19:16:25
Done.
|
| + << "thread."; |
| return is_valid_; |
| } |