wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 863884 - Prepare WeakPtr to support a thread-safe variant; r=Waldo

Browse Source
This commit is contained in:
Ehsan Akhgari 2013-04-19 17:59:01 -04:00
parent 2cd988e435
commit 8b9a514d5f
2 changed files with 60 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mfbt/RefPtr.h
View File

@ -10,6 +10,7 @@
#include "mozilla/Assertions.h"
#include "mozilla/Attributes.h"
#include "mozilla/TypeTraits.h"
namespace mozilla {
@ -53,7 +54,11 @@ class RefCounted
protected:
RefCounted() : refCnt(0) { }
~RefCounted() { MOZ_ASSERT(refCnt == detail::DEAD); }
~RefCounted() {
MOZ_ASSERT(refCnt == detail::DEAD);
MOZ_STATIC_ASSERT((IsBaseOf<RefCounted<T>, T>::value),
"T must derive from RefCounted<T>");
}
public:
// Compatibility with nsRefPtr.

86
mfbt/WeakPtr.h
View File

@ -65,56 +65,68 @@
namespace mozilla {
template <typename T> class WeakPtr;
template <typename T, class WeakReference> class WeakPtrBase;
template <typename T, class WeakReference> class SupportsWeakPtrBase;
template <typename T>
class SupportsWeakPtr
namespace detail {
// This can live beyond the lifetime of the class derived from SupportsWeakPtrBase.
template<class T>
class WeakReference : public RefCounted<WeakReference<T> >
{
public:
WeakPtr<T> asWeakPtr() {
explicit WeakReference(T* p) : ptr(p) {}
T* get() const {
return ptr;
}
private:
friend class WeakPtrBase<T, WeakReference<T> >;
friend class SupportsWeakPtrBase<T, WeakReference<T> >;
void detach() {
ptr = nullptr;
}
T* ptr;
};
} // namespace detail
template <typename T, class WeakReference>
class SupportsWeakPtrBase
{
public:
WeakPtrBase<T, WeakReference> asWeakPtr() {
if (!weakRef)
weakRef = new WeakReference(static_cast<T*>(this));
return WeakPtr<T>(weakRef);
return WeakPtrBase<T, WeakReference>(weakRef);
}
protected:
~SupportsWeakPtr() {
MOZ_STATIC_ASSERT((IsBaseOf<SupportsWeakPtr<T>, T>::value), "T must derive from SupportsWeakPtr<T>");
~SupportsWeakPtrBase() {
MOZ_STATIC_ASSERT((IsBaseOf<SupportsWeakPtrBase<T, WeakReference>, T>::value),
"T must derive from SupportsWeakPtrBase<T, WeakReference>");
if (weakRef)
weakRef->detach();
}
private:
friend class WeakPtr<T>;
// This can live beyond the lifetime of the class derived from SupportsWeakPtr.
class WeakReference : public RefCounted<WeakReference>
{
public:
explicit WeakReference(T* p) : ptr(p) {}
T* get() const {
return ptr;
}
private:
friend class WeakPtr<T>;
friend class SupportsWeakPtr<T>;
void detach() {
ptr = nullptr;
}
T* ptr;
};
friend class WeakPtrBase<T, WeakReference>;
RefPtr<WeakReference> weakRef;
};
template <typename T>
class WeakPtr
class SupportsWeakPtr : public SupportsWeakPtrBase<T, detail::WeakReference<T> >
{
};
template <typename T, class WeakReference>
class WeakPtrBase
{
public:
WeakPtr(const WeakPtr<T>& o) : ref(o.ref) {}
WeakPtrBase(const WeakPtrBase<T, WeakReference>& o) : ref(o.ref) {}
// Ensure that ref is dereferenceable in the uninitialized state
WeakPtr() : ref(new typename SupportsWeakPtr<T>::WeakReference(nullptr)) {}
WeakPtrBase() : ref(new WeakReference(nullptr)) {}
operator T*() const {
return ref->get();
@ -132,11 +144,21 @@ class WeakPtr
}
private:
friend class SupportsWeakPtr<T>;
friend class SupportsWeakPtrBase<T, WeakReference>;
explicit WeakPtr(const RefPtr<typename SupportsWeakPtr<T>::WeakReference> &o) : ref(o) {}
explicit WeakPtrBase(const RefPtr<WeakReference> &o) : ref(o) {}
RefPtr<typename SupportsWeakPtr<T>::WeakReference> ref;
RefPtr<WeakReference> ref;
};
template <typename T>
class WeakPtr : public WeakPtrBase<T, detail::WeakReference<T> >
{
typedef WeakPtrBase<T, detail::WeakReference<T> > Base;
public:
WeakPtr(const WeakPtr<T>& o) : Base(o) {}
WeakPtr(const Base& o) : Base(o) {}
WeakPtr() {}
};
} // namespace mozilla