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

Side by Side Diff: base/memory/weak_ptr.cc

Issue 18501008: base: Change WeakPtr to use SequenceChecker instead of ThreadChecker. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix race Created 7 years, 5 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/memory/weak_ptr.h" 5 #include "base/memory/weak_ptr.h"
6 6
7 namespace base { 7 namespace base {
8 namespace internal { 8 namespace internal {
9 9
10 WeakReference::Flag::Flag() : is_valid_(true) { 10 WeakReference::Flag::Flag() : is_valid_(true) {
11 // Flags only become bound when checked for validity, or invalidated, 11 // Flags only become bound when checked for validity, or invalidated,
12 // so that we can check that later validity/invalidation operations on 12 // so that we can check that later validity/invalidation operations on
13 // the same Flag take place on the same thread. 13 // the same Flag take place on the same sequence.
14 thread_checker_.DetachFromThread(); 14 sequence_checker_.DetachFromSequence();
15 } 15 }
16 16
17 void WeakReference::Flag::Invalidate() { 17 void WeakReference::Flag::Invalidate() {
18 // The flag being invalidated with a single ref implies that there are no 18 // The flag being invalidated with a single ref implies that there are no
19 // weak pointers in existence. Allow deletion on other thread in this case. 19 // weak pointers in existence. Allow deletion on other thread in this case.
20 DCHECK(thread_checker_.CalledOnValidThread() || HasOneRef()) 20 DCHECK(sequence_checker_.CalledOnValidSequencedThread() || HasOneRef())
21 << "WeakPtrs must be checked and invalidated on the same thread."; 21 << "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.
22 << "thread.";
22 is_valid_ = false; 23 is_valid_ = false;
23 } 24 }
24 25
25 bool WeakReference::Flag::IsValid() const { 26 bool WeakReference::Flag::IsValid() const {
26 DCHECK(thread_checker_.CalledOnValidThread()) 27 DCHECK(sequence_checker_.CalledOnValidSequencedThread())
27 << "WeakPtrs must be checked and invalidated on the same thread."; 28 << "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.
29 << "thread.";
28 return is_valid_; 30 return is_valid_;
29 } 31 }
30 32
31 WeakReference::Flag::~Flag() { 33 WeakReference::Flag::~Flag() {
32 } 34 }
33 35
34 WeakReference::WeakReference() { 36 WeakReference::WeakReference() {
35 } 37 }
36 38
37 WeakReference::WeakReference(const Flag* flag) : flag_(flag) { 39 WeakReference::WeakReference(const Flag* flag) : flag_(flag) {
(...skipping 30 matching lines...) Expand all
68 } 70 }
69 71
70 WeakPtrBase::~WeakPtrBase() { 72 WeakPtrBase::~WeakPtrBase() {
71 } 73 }
72 74
73 WeakPtrBase::WeakPtrBase(const WeakReference& ref) : ref_(ref) { 75 WeakPtrBase::WeakPtrBase(const WeakReference& ref) : ref_(ref) {
74 } 76 }
75 77
76 } // namespace internal 78 } // namespace internal
77 } // namespace base 79 } // namespace base
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698