summaryrefslogtreecommitdiffstats
path: root/base/memory/weak_ptr.cc
diff options
context:
space:
mode:
Diffstat (limited to 'base/memory/weak_ptr.cc')
-rw-r--r--base/memory/weak_ptr.cc24
1 files changed, 7 insertions, 17 deletions
diff --git a/base/memory/weak_ptr.cc b/base/memory/weak_ptr.cc
index fb09219..30c777c 100644
--- a/base/memory/weak_ptr.cc
+++ b/base/memory/weak_ptr.cc
@@ -10,31 +10,21 @@ namespace internal {
WeakReference::Flag::Flag(Flag** handle) : handle_(handle) {
}
-WeakReference::Flag::~Flag() {
- if (handle_)
- *handle_ = NULL;
-}
-
-void WeakReference::Flag::AddRef() const {
- DCHECK(CalledOnValidThread());
- RefCounted<Flag>::AddRef();
-}
-
-void WeakReference::Flag::Release() const {
- DCHECK(CalledOnValidThread());
- RefCounted<Flag>::Release();
-}
-
void WeakReference::Flag::Invalidate() {
- DCHECK(CalledOnValidThread());
+ DCHECK(thread_checker_.CalledOnValidThread());
handle_ = NULL;
}
bool WeakReference::Flag::IsValid() const {
- DCHECK(CalledOnValidThread());
+ DCHECK(thread_checker_.CalledOnValidThread());
return handle_ != NULL;
}
+WeakReference::Flag::~Flag() {
+ if (handle_)
+ *handle_ = NULL;
+}
+
WeakReference::WeakReference() {
}