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
98 lines
5.0 KiB
C++
98 lines
5.0 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/* 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 mozilla_GenericModule_h
|
|
#define mozilla_GenericModule_h
|
|
|
|
#include "mozilla/Attributes.h"
|
|
#include "mozilla/Module.h"
|
|
|
|
#define NS_GENERIC_FACTORY_CONSTRUCTOR(_InstanceClass) \
|
|
static nsresult \
|
|
_InstanceClass##Constructor(nsISupports *aOuter, REFNSIID aIID, \
|
|
void **aResult) \
|
|
{ \
|
|
RefPtr<_InstanceClass> inst; \
|
|
\
|
|
*aResult = nullptr; \
|
|
if (nullptr != aOuter) { \
|
|
return NS_ERROR_NO_AGGREGATION; \
|
|
} \
|
|
\
|
|
inst = new _InstanceClass(); \
|
|
return inst->QueryInterface(aIID, aResult); \
|
|
}
|
|
|
|
#define NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(_InstanceClass, _InitMethod) \
|
|
static nsresult \
|
|
_InstanceClass##Constructor(nsISupports *aOuter, REFNSIID aIID, \
|
|
void **aResult) \
|
|
{ \
|
|
nsresult rv; \
|
|
\
|
|
RefPtr<_InstanceClass> inst; \
|
|
\
|
|
*aResult = nullptr; \
|
|
if (nullptr != aOuter) { \
|
|
return NS_ERROR_NO_AGGREGATION; \
|
|
} \
|
|
\
|
|
inst = new _InstanceClass(); \
|
|
rv = inst->_InitMethod(); \
|
|
if(NS_SUCCEEDED(rv)) { \
|
|
rv = inst->QueryInterface(aIID, aResult); \
|
|
} \
|
|
\
|
|
return rv; \
|
|
}
|
|
|
|
// 'Constructor' that uses an existing getter function that gets a singleton.
|
|
// NOTE: assumes that getter does an AddRef - so additional AddRef is not done.
|
|
#define NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(_InstanceClass, _GetterProc) \
|
|
static nsresult \
|
|
_InstanceClass##Constructor(nsISupports *aOuter, REFNSIID aIID, \
|
|
void **aResult) \
|
|
{ \
|
|
RefPtr<_InstanceClass> inst; \
|
|
\
|
|
*aResult = nullptr; \
|
|
if (nullptr != aOuter) { \
|
|
return NS_ERROR_NO_AGGREGATION; \
|
|
} \
|
|
\
|
|
inst = already_AddRefed<_InstanceClass>(_GetterProc()); \
|
|
if (nullptr == inst) { \
|
|
return NS_ERROR_OUT_OF_MEMORY; \
|
|
} \
|
|
return inst->QueryInterface(aIID, aResult); \
|
|
}
|
|
|
|
#ifndef MOZILLA_INTERNAL_API
|
|
|
|
#include "nsIModule.h"
|
|
#include "nsISupportsUtils.h"
|
|
|
|
namespace mozilla {
|
|
|
|
class GenericModule final : public nsIModule
|
|
{
|
|
~GenericModule() {}
|
|
|
|
public:
|
|
explicit GenericModule(const mozilla::Module* aData) : mData(aData) {}
|
|
|
|
NS_DECL_THREADSAFE_ISUPPORTS
|
|
NS_DECL_NSIMODULE
|
|
|
|
private:
|
|
const mozilla::Module* mData;
|
|
};
|
|
|
|
} // namespace mozilla
|
|
|
|
#endif
|
|
|
|
#endif // mozilla_GenericModule_h
|