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 850054 - Add opt-out for strict checking in nsMainThreadPtrHolder. r=bsmedberg

Browse Source
This commit is contained in:
Bobby Holley 2013-03-15 10:41:48 -07:00
parent f340ed3238
commit 0e23e73322
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
xpcom/glue/nsProxyRelease.h
View File

@ -105,11 +105,15 @@ template<class T>
class nsMainThreadPtrHolder MOZ_FINAL
{
public:
// We can only acquire a pointer on the main thread.
nsMainThreadPtrHolder(T* ptr) : mRawPtr(NULL) {
// We can only acquire a pointer on the main thread. We to fail fast for
// threading bugs, so by default we assert if our pointer is used or acquired
// off-main-thread. But some consumers need to use the same pointer for
// multiple classes, some of which are main-thread-only and some of which
// aren't. So we allow them to explicitly disable this strict checking.
nsMainThreadPtrHolder(T* ptr, bool strict = true) : mRawPtr(NULL), mStrict(strict) {
// We can only AddRef our pointer on the main thread, which means that the
// holder must be constructed on the main thread.
MOZ_ASSERT(NS_IsMainThread());
MOZ_ASSERT(!mStrict || NS_IsMainThread());
NS_IF_ADDREF(mRawPtr = ptr);
}
@ -129,7 +133,7 @@ public:
T* get() {
// Nobody should be touching the raw pointer off-main-thread.
if (MOZ_UNLIKELY(!NS_IsMainThread())) {
if (mStrict && MOZ_UNLIKELY(!NS_IsMainThread())) {
NS_ERROR("Can't dereference nsMainThreadPtrHolder off main thread");
MOZ_CRASH();
}
@ -148,6 +152,9 @@ private:
// Our wrapped pointer.
T* mRawPtr;
// Whether to strictly enforce thread invariants in this class.
bool mStrict;
// Copy constructor and operator= not implemented. Once constructed, the
// holder is immutable.
T& operator=(nsMainThreadPtrHolder& other);
@ -180,7 +187,6 @@ class nsMainThreadPtrHandle
// these handles as opaque.
T* get()
{
MOZ_ASSERT(NS_IsMainThread());
if (mPtr) {
return mPtr.get()->get();
}
@ -188,7 +194,6 @@ class nsMainThreadPtrHandle
}
const T* get() const
{
MOZ_ASSERT(NS_IsMainThread());
if (mPtr) {
return mPtr.get()->get();
}