mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-08 04:27:37 +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
110 lines
2.7 KiB
C++
110 lines
2.7 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/. */
|
|
|
|
#ifndef nsQueryObject_h
|
|
#define nsQueryObject_h
|
|
|
|
#include "mozilla/Attributes.h"
|
|
|
|
#include "nsCOMPtr.h"
|
|
#include "mozilla/RefPtr.h"
|
|
|
|
/*****************************************************************************/
|
|
|
|
template<class T>
|
|
class MOZ_STACK_CLASS nsQueryObject final : public nsCOMPtr_helper
|
|
{
|
|
public:
|
|
explicit nsQueryObject(T* aRawPtr)
|
|
: mRawPtr(aRawPtr)
|
|
{
|
|
}
|
|
|
|
virtual nsresult NS_FASTCALL operator()(const nsIID& aIID,
|
|
void** aResult) const
|
|
{
|
|
nsresult status = mRawPtr ? mRawPtr->QueryInterface(aIID, aResult)
|
|
: NS_ERROR_NULL_POINTER;
|
|
return status;
|
|
}
|
|
private:
|
|
T* MOZ_NON_OWNING_REF mRawPtr;
|
|
};
|
|
|
|
template<class T>
|
|
class MOZ_STACK_CLASS nsQueryObjectWithError final : public nsCOMPtr_helper
|
|
{
|
|
public:
|
|
nsQueryObjectWithError(T* aRawPtr, nsresult* aErrorPtr)
|
|
: mRawPtr(aRawPtr), mErrorPtr(aErrorPtr)
|
|
{
|
|
}
|
|
|
|
virtual nsresult NS_FASTCALL operator()(const nsIID& aIID,
|
|
void** aResult) const
|
|
{
|
|
nsresult status = mRawPtr ? mRawPtr->QueryInterface(aIID, aResult)
|
|
: NS_ERROR_NULL_POINTER;
|
|
if (mErrorPtr) {
|
|
*mErrorPtr = status;
|
|
}
|
|
return status;
|
|
}
|
|
private:
|
|
T* MOZ_NON_OWNING_REF mRawPtr;
|
|
nsresult* mErrorPtr;
|
|
};
|
|
|
|
/*****************************************************************************/
|
|
|
|
/*****************************************************************************/
|
|
|
|
template<class T>
|
|
inline nsQueryObject<T>
|
|
do_QueryObject(T* aRawPtr)
|
|
{
|
|
return nsQueryObject<T>(aRawPtr);
|
|
}
|
|
|
|
template<class T>
|
|
inline nsQueryObject<T>
|
|
do_QueryObject(nsCOMPtr<T>& aRawPtr)
|
|
{
|
|
return nsQueryObject<T>(aRawPtr);
|
|
}
|
|
|
|
template<class T>
|
|
inline nsQueryObject<T>
|
|
do_QueryObject(RefPtr<T>& aRawPtr)
|
|
{
|
|
return nsQueryObject<T>(aRawPtr);
|
|
}
|
|
|
|
template<class T>
|
|
inline nsQueryObjectWithError<T>
|
|
do_QueryObject(T* aRawPtr, nsresult* aErrorPtr)
|
|
{
|
|
return nsQueryObjectWithError<T>(aRawPtr, aErrorPtr);
|
|
}
|
|
|
|
template<class T>
|
|
inline nsQueryObjectWithError<T>
|
|
do_QueryObject(nsCOMPtr<T>& aRawPtr, nsresult* aErrorPtr)
|
|
{
|
|
return nsQueryObjectWithError<T>(aRawPtr, aErrorPtr);
|
|
}
|
|
|
|
template<class T>
|
|
inline nsQueryObjectWithError<T>
|
|
do_QueryObject(RefPtr<T>& aRawPtr, nsresult* aErrorPtr)
|
|
{
|
|
return nsQueryObjectWithError<T>(aRawPtr, aErrorPtr);
|
|
}
|
|
|
|
/*****************************************************************************/
|
|
|
|
#endif // !defined(nsQueryObject_h)
|