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

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

Issue 7013059: Fix base::internal::WeakReferenceOwner races. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « base/memory/weak_ptr.h ('k') | base/memory/weak_ptr_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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(Flag** handle) : handle_(handle) { 10 WeakReference::Flag::Flag(Flag** handle) : handle_(handle) {
(...skipping 28 matching lines...) Expand all
39 } 39 }
40 40
41 WeakReferenceOwner::WeakReferenceOwner() : flag_(NULL) { 41 WeakReferenceOwner::WeakReferenceOwner() : flag_(NULL) {
42 } 42 }
43 43
44 WeakReferenceOwner::~WeakReferenceOwner() { 44 WeakReferenceOwner::~WeakReferenceOwner() {
45 Invalidate(); 45 Invalidate();
46 } 46 }
47 47
48 WeakReference WeakReferenceOwner::GetRef() const { 48 WeakReference WeakReferenceOwner::GetRef() const {
49 AutoLock auto_lock(lock_);
49 if (!flag_) 50 if (!flag_)
50 flag_ = new WeakReference::Flag(&flag_); 51 flag_ = new WeakReference::Flag(&flag_);
51 return WeakReference(flag_); 52 return WeakReference(flag_);
52 } 53 }
53 54
54 void WeakReferenceOwner::Invalidate() { 55 void WeakReferenceOwner::Invalidate() {
55 if (flag_) { 56 if (flag_) {
56 flag_->Invalidate(); 57 flag_->Invalidate();
57 flag_ = NULL; 58 flag_ = NULL;
58 } 59 }
59 } 60 }
60 61
61 WeakPtrBase::WeakPtrBase() { 62 WeakPtrBase::WeakPtrBase() {
62 } 63 }
63 64
64 WeakPtrBase::~WeakPtrBase() { 65 WeakPtrBase::~WeakPtrBase() {
65 } 66 }
66 67
67 WeakPtrBase::WeakPtrBase(const WeakReference& ref) : ref_(ref) { 68 WeakPtrBase::WeakPtrBase(const WeakReference& ref) : ref_(ref) {
68 } 69 }
69 70
70 } // namespace internal 71 } // namespace internal
71 } // namespace base 72 } // namespace base
OLDNEW
« no previous file with comments | « base/memory/weak_ptr.h ('k') | base/memory/weak_ptr_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698