| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/supports_user_data.h" | 5 #include "base/supports_user_data.h" |
| 6 | 6 |
| 7 #include "base/memory/ptr_util.h" |
| 8 |
| 7 namespace base { | 9 namespace base { |
| 8 | 10 |
| 9 SupportsUserData::SupportsUserData() { | 11 SupportsUserData::SupportsUserData() { |
| 10 // Harmless to construct on a different thread to subsequent usage. | 12 // Harmless to construct on a different thread to subsequent usage. |
| 11 thread_checker_.DetachFromThread(); | 13 thread_checker_.DetachFromThread(); |
| 12 } | 14 } |
| 13 | 15 |
| 14 SupportsUserData::Data* SupportsUserData::GetUserData(const void* key) const { | 16 SupportsUserData::Data* SupportsUserData::GetUserData(const void* key) const { |
| 15 DCHECK(thread_checker_.CalledOnValidThread()); | 17 DCHECK(thread_checker_.CalledOnValidThread()); |
| 16 DataMap::const_iterator found = user_data_.find(key); | 18 DataMap::const_iterator found = user_data_.find(key); |
| 17 if (found != user_data_.end()) | 19 if (found != user_data_.end()) |
| 18 return found->second.get(); | 20 return found->second.get(); |
| 19 return NULL; | 21 return NULL; |
| 20 } | 22 } |
| 21 | 23 |
| 22 void SupportsUserData::SetUserData(const void* key, Data* data) { | 24 void SupportsUserData::SetUserData(const void* key, Data* data) { |
| 23 DCHECK(thread_checker_.CalledOnValidThread()); | 25 DCHECK(thread_checker_.CalledOnValidThread()); |
| 24 user_data_[key] = make_scoped_ptr(data); | 26 user_data_[key] = base::WrapUnique(data); |
| 25 } | 27 } |
| 26 | 28 |
| 27 void SupportsUserData::RemoveUserData(const void* key) { | 29 void SupportsUserData::RemoveUserData(const void* key) { |
| 28 DCHECK(thread_checker_.CalledOnValidThread()); | 30 DCHECK(thread_checker_.CalledOnValidThread()); |
| 29 user_data_.erase(key); | 31 user_data_.erase(key); |
| 30 } | 32 } |
| 31 | 33 |
| 32 void SupportsUserData::DetachUserDataThread() { | 34 void SupportsUserData::DetachUserDataThread() { |
| 33 thread_checker_.DetachFromThread(); | 35 thread_checker_.DetachFromThread(); |
| 34 } | 36 } |
| 35 | 37 |
| 36 SupportsUserData::~SupportsUserData() { | 38 SupportsUserData::~SupportsUserData() { |
| 37 DCHECK(thread_checker_.CalledOnValidThread() || user_data_.empty()); | 39 DCHECK(thread_checker_.CalledOnValidThread() || user_data_.empty()); |
| 38 DataMap local_user_data; | 40 DataMap local_user_data; |
| 39 user_data_.swap(local_user_data); | 41 user_data_.swap(local_user_data); |
| 40 // Now this->user_data_ is empty, and any destructors called transitively from | 42 // Now this->user_data_ is empty, and any destructors called transitively from |
| 41 // the destruction of |local_user_data| will see it that way instead of | 43 // the destruction of |local_user_data| will see it that way instead of |
| 42 // examining a being-destroyed object. | 44 // examining a being-destroyed object. |
| 43 } | 45 } |
| 44 | 46 |
| 45 } // namespace base | 47 } // namespace base |
| OLD | NEW |