mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-01 06:35:42 +00:00
01583602a9
The bulk of this commit was generated with a script, executed at the top
level of a typical source code checkout. The only non-machine-generated
part was modifying MFBT's moz.build to reflect the new naming.
CLOSED TREE makes big refactorings like this a piece of cake.
# The main substitution.
find . -name '*.cpp' -o -name '*.cc' -o -name '*.h' -o -name '*.mm' -o -name '*.idl'| \
xargs perl -p -i -e '
s/nsRefPtr\.h/RefPtr\.h/g; # handle includes
s/nsRefPtr ?</RefPtr</g; # handle declarations and variables
'
# Handle a special friend declaration in gfx/layers/AtomicRefCountedWithFinalize.h.
perl -p -i -e 's/::nsRefPtr;/::RefPtr;/' gfx/layers/AtomicRefCountedWithFinalize.h
# Handle nsRefPtr.h itself, a couple places that define constructors
# from nsRefPtr, and code generators specially. We do this here, rather
# than indiscriminantly s/nsRefPtr/RefPtr/, because that would rename
# things like nsRefPtrHashtable.
perl -p -i -e 's/nsRefPtr/RefPtr/g' \
mfbt/nsRefPtr.h \
xpcom/glue/nsCOMPtr.h \
xpcom/base/OwningNonNull.h \
ipc/ipdl/ipdl/lower.py \
ipc/ipdl/ipdl/builtin.py \
dom/bindings/Codegen.py \
python/lldbutils/lldbutils/utils.py
# In our indiscriminate substitution above, we renamed
# nsRefPtrGetterAddRefs, the class behind getter_AddRefs. Fix that up.
find . -name '*.cpp' -o -name '*.h' -o -name '*.idl' | \
xargs perl -p -i -e 's/nsRefPtrGetterAddRefs/RefPtrGetterAddRefs/g'
if [ -d .git ]; then
git mv mfbt/nsRefPtr.h mfbt/RefPtr.h
else
hg mv mfbt/nsRefPtr.h mfbt/RefPtr.h
fi
--HG--
rename : mfbt/nsRefPtr.h => mfbt/RefPtr.h
162 lines
3.2 KiB
C++
162 lines
3.2 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
/* A class for non-null strong pointers to reference-counted objects. */
|
|
|
|
#ifndef mozilla_OwningNonNull_h
|
|
#define mozilla_OwningNonNull_h
|
|
|
|
#include "nsAutoPtr.h"
|
|
#include "nsCycleCollectionNoteChild.h"
|
|
|
|
namespace mozilla {
|
|
|
|
template<class T>
|
|
class OwningNonNull
|
|
{
|
|
public:
|
|
OwningNonNull() {}
|
|
|
|
MOZ_IMPLICIT OwningNonNull(T& aValue)
|
|
{
|
|
init(&aValue);
|
|
}
|
|
|
|
template<class U>
|
|
MOZ_IMPLICIT OwningNonNull(already_AddRefed<U>&& aValue)
|
|
{
|
|
init(aValue);
|
|
}
|
|
|
|
// This is no worse than get() in terms of const handling.
|
|
operator T&() const
|
|
{
|
|
MOZ_ASSERT(mInited);
|
|
MOZ_ASSERT(mPtr, "OwningNonNull<T> was set to null");
|
|
return *mPtr;
|
|
}
|
|
|
|
operator T*() const
|
|
{
|
|
MOZ_ASSERT(mInited);
|
|
MOZ_ASSERT(mPtr, "OwningNonNull<T> was set to null");
|
|
return mPtr;
|
|
}
|
|
|
|
// Conversion to bool is always true, so delete to catch errors
|
|
explicit operator bool() const = delete;
|
|
|
|
T*
|
|
operator->() const
|
|
{
|
|
MOZ_ASSERT(mInited);
|
|
MOZ_ASSERT(mPtr, "OwningNonNull<T> was set to null");
|
|
return mPtr;
|
|
}
|
|
|
|
OwningNonNull<T>&
|
|
operator=(T* aValue)
|
|
{
|
|
init(aValue);
|
|
return *this;
|
|
}
|
|
|
|
OwningNonNull<T>&
|
|
operator=(T& aValue)
|
|
{
|
|
init(&aValue);
|
|
return *this;
|
|
}
|
|
|
|
OwningNonNull<T>&
|
|
operator=(already_AddRefed<T>&& aValue)
|
|
{
|
|
init(aValue);
|
|
return *this;
|
|
}
|
|
|
|
// Don't allow assigning nullptr, it makes no sense
|
|
void operator=(decltype(nullptr)) = delete;
|
|
|
|
already_AddRefed<T> forget()
|
|
{
|
|
#ifdef DEBUG
|
|
mInited = false;
|
|
#endif
|
|
return mPtr.forget();
|
|
}
|
|
|
|
// Make us work with smart pointer helpers that expect a get().
|
|
T* get() const
|
|
{
|
|
MOZ_ASSERT(mInited);
|
|
MOZ_ASSERT(mPtr);
|
|
return mPtr;
|
|
}
|
|
|
|
template<typename U>
|
|
void swap(U& aOther)
|
|
{
|
|
mPtr.swap(aOther);
|
|
}
|
|
|
|
protected:
|
|
template<typename U>
|
|
void init(U&& aValue)
|
|
{
|
|
mPtr = aValue;
|
|
MOZ_ASSERT(mPtr);
|
|
#ifdef DEBUG
|
|
mInited = true;
|
|
#endif
|
|
}
|
|
|
|
RefPtr<T> mPtr;
|
|
#ifdef DEBUG
|
|
bool mInited = false;
|
|
#endif
|
|
};
|
|
|
|
template <typename T>
|
|
inline void
|
|
ImplCycleCollectionTraverse(nsCycleCollectionTraversalCallback& aCallback,
|
|
OwningNonNull<T>& aField,
|
|
const char* aName,
|
|
uint32_t aFlags = 0)
|
|
{
|
|
CycleCollectionNoteChild(aCallback, aField.get(), aName, aFlags);
|
|
}
|
|
|
|
} // namespace mozilla
|
|
|
|
// Declared in nsCOMPtr.h
|
|
template<class T> template<class U>
|
|
nsCOMPtr<T>::nsCOMPtr(const mozilla::OwningNonNull<U>& aOther)
|
|
: nsCOMPtr(aOther.get())
|
|
{}
|
|
|
|
template<class T> template<class U>
|
|
nsCOMPtr<T>&
|
|
nsCOMPtr<T>::operator=(const mozilla::OwningNonNull<U>& aOther)
|
|
{
|
|
return operator=(aOther.get());
|
|
}
|
|
|
|
// Declared in mozilla/RefPtr.h
|
|
template<class T> template<class U>
|
|
RefPtr<T>::RefPtr(const mozilla::OwningNonNull<U>& aOther)
|
|
: RefPtr(aOther.get())
|
|
{}
|
|
|
|
template<class T> template<class U>
|
|
RefPtr<T>&
|
|
RefPtr<T>::operator=(const mozilla::OwningNonNull<U>& aOther)
|
|
{
|
|
return operator=(aOther.get());
|
|
}
|
|
|
|
#endif // mozilla_OwningNonNull_h
|