Import cobalt 25.master.0.1034729
diff --git a/base/memory/weak_ptr.cc b/base/memory/weak_ptr.cc
index c993fcb..70a0213 100644
--- a/base/memory/weak_ptr.cc
+++ b/base/memory/weak_ptr.cc
@@ -1,11 +1,16 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2011 The Chromium Authors
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "base/memory/weak_ptr.h"
-namespace base {
-namespace internal {
+#if DCHECK_IS_ON()
+#include <ostream>
+
+#include "base/debug/stack_trace.h"
+#endif
+
+namespace base::internal {
WeakReference::Flag::Flag() {
// Flags only become bound when checked for validity, or invalidated,
@@ -18,15 +23,19 @@
// 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.
#if DCHECK_IS_ON()
- DCHECK(sequence_checker_.CalledOnValidSequence() || HasOneRef())
- << "WeakPtrs must be invalidated on the same sequenced thread.";
+ std::unique_ptr<debug::StackTrace> bound_at;
+ DCHECK(sequence_checker_.CalledOnValidSequence(&bound_at) || HasOneRef())
+ << "WeakPtrs must be invalidated on the same sequenced thread as where "
+ << "they are bound.\n"
+ << (bound_at ? "This was bound at:\n" + bound_at->ToString() : "")
+ << "Check failed at:";
#endif
invalidated_.Set();
}
bool WeakReference::Flag::IsValid() const {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_)
- << "WeakPtrs must be checked on the same sequenced thread.";
+ // WeakPtrs must be checked on the same sequenced thread.
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
return !invalidated_.IsSet();
}
@@ -34,17 +43,28 @@
return !invalidated_.IsSet();
}
+#if DCHECK_IS_ON()
+void WeakReference::Flag::DetachFromSequence() {
+ DETACH_FROM_SEQUENCE(sequence_checker_);
+}
+#endif
+
WeakReference::Flag::~Flag() = default;
WeakReference::WeakReference() = default;
-
WeakReference::WeakReference(const scoped_refptr<Flag>& flag) : flag_(flag) {}
-
WeakReference::~WeakReference() = default;
-WeakReference::WeakReference(WeakReference&& other) = default;
-
WeakReference::WeakReference(const WeakReference& other) = default;
+WeakReference& WeakReference::operator=(const WeakReference& other) = default;
+
+WeakReference::WeakReference(WeakReference&& other) noexcept = default;
+WeakReference& WeakReference::operator=(WeakReference&& other) noexcept =
+ default;
+
+void WeakReference::Reset() {
+ flag_ = nullptr;
+}
bool WeakReference::IsValid() const {
return flag_ && flag_->IsValid();
@@ -54,34 +74,26 @@
return flag_ && flag_->MaybeValid();
}
-WeakReferenceOwner::WeakReferenceOwner() = default;
+WeakReferenceOwner::WeakReferenceOwner()
+ : flag_(MakeRefCounted<WeakReference::Flag>()) {}
WeakReferenceOwner::~WeakReferenceOwner() {
- Invalidate();
+ flag_->Invalidate();
}
WeakReference WeakReferenceOwner::GetRef() const {
- // If we hold the last reference to the Flag then create a new one.
+#if DCHECK_IS_ON()
+ // If we hold the last reference to the Flag then detach the SequenceChecker.
if (!HasRefs())
- flag_ = new WeakReference::Flag();
+ flag_->DetachFromSequence();
+#endif
return WeakReference(flag_);
}
void WeakReferenceOwner::Invalidate() {
- if (flag_) {
- flag_->Invalidate();
- flag_ = nullptr;
- }
-}
-
-WeakPtrBase::WeakPtrBase() : ptr_(0) {}
-
-WeakPtrBase::~WeakPtrBase() = default;
-
-WeakPtrBase::WeakPtrBase(const WeakReference& ref, uintptr_t ptr)
- : ref_(ref), ptr_(ptr) {
- DCHECK(ptr_);
+ flag_->Invalidate();
+ flag_ = MakeRefCounted<WeakReference::Flag>();
}
WeakPtrFactoryBase::WeakPtrFactoryBase(uintptr_t ptr) : ptr_(ptr) {
@@ -92,5 +104,4 @@
ptr_ = 0;
}
-} // namespace internal
-} // namespace base
+} // namespace base::internal
