| Index: base/memory/weak_ptr.h
|
| diff --git a/base/memory/weak_ptr.h b/base/memory/weak_ptr.h
|
| index b4120a1140d109ff89f60e71a55e031e128220c9..b28386f73bad22fb488c88d4d45508a68170993c 100644
|
| --- a/base/memory/weak_ptr.h
|
| +++ b/base/memory/weak_ptr.h
|
| @@ -90,9 +90,6 @@ class BASE_EXPORT WeakReference {
|
| void Invalidate();
|
| bool IsValid() const;
|
|
|
| - // Remove this when crbug.com/234964 is addressed.
|
| - void DetachFromThreadHack() { sequence_checker_.DetachFromSequence(); }
|
| -
|
| private:
|
| friend class base::RefCountedThreadSafe<Flag>;
|
|
|
| @@ -125,12 +122,6 @@ class BASE_EXPORT WeakReferenceOwner {
|
|
|
| void Invalidate();
|
|
|
| - // Remove this when crbug.com/234964 is addressed.
|
| - void DetachFromThreadHack() {
|
| - if (flag_.get())
|
| - flag_->DetachFromThreadHack();
|
| - }
|
| -
|
| private:
|
| mutable scoped_refptr<WeakReference::Flag> flag_;
|
| };
|
| @@ -311,17 +302,11 @@ class SupportsWeakPtr : public internal::SupportsWeakPtrBase {
|
| return WeakPtr<T>(weak_reference_owner_.GetRef(), static_cast<T*>(this));
|
| }
|
|
|
| - // Removes the binding, if any, from this object to a particular thread.
|
| - // This is used in WebGraphicsContext3DInProcessCommandBufferImpl to work-
|
| - // around access to cmmand buffer objects by more than one thread.
|
| - // Remove this when crbug.com/234964 is addressed.
|
| - void DetachFromThreadHack() {
|
| - weak_reference_owner_.DetachFromThreadHack();
|
| - }
|
| -
|
| protected:
|
| ~SupportsWeakPtr() {}
|
|
|
| + void InvalidateWeakPtrs() { weak_reference_owner_.Invalidate(); }
|
| +
|
| private:
|
| internal::WeakReferenceOwner weak_reference_owner_;
|
| DISALLOW_COPY_AND_ASSIGN(SupportsWeakPtr);
|
|
|