mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-21 01:05:45 +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
63 lines
1.5 KiB
C++
63 lines
1.5 KiB
C++
/* -*- Mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 40 -*- */
|
|
/* vim: set ts=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 mozilla_system_mozmtpserver_h__
|
|
#define mozilla_system_mozmtpserver_h__
|
|
|
|
#include "MozMtpCommon.h"
|
|
#include "MozMtpDatabase.h"
|
|
|
|
#include "mozilla/FileUtils.h"
|
|
|
|
#include "nsAutoPtr.h"
|
|
#include "nsCOMPtr.h"
|
|
#include "nsIThread.h"
|
|
|
|
BEGIN_MTP_NAMESPACE
|
|
using namespace android;
|
|
|
|
class RefCountedMtpServer : public MtpServer
|
|
{
|
|
public:
|
|
NS_INLINE_DECL_THREADSAFE_REFCOUNTING(RefCountedMtpServer)
|
|
|
|
RefCountedMtpServer(int aFd, MtpDatabase* aDatabase, bool aPtp,
|
|
int aFileGroup, int aFilePerm, int aDirectoryPerm)
|
|
: MtpServer(aFd, aDatabase, aPtp, aFileGroup, aFilePerm, aDirectoryPerm)
|
|
{
|
|
}
|
|
|
|
protected:
|
|
virtual ~RefCountedMtpServer() {}
|
|
};
|
|
|
|
class MozMtpServer
|
|
{
|
|
public:
|
|
NS_INLINE_DECL_THREADSAFE_REFCOUNTING(MozMtpServer)
|
|
|
|
bool Init();
|
|
void Run();
|
|
|
|
already_AddRefed<RefCountedMtpServer> GetMtpServer();
|
|
already_AddRefed<MozMtpDatabase> GetMozMtpDatabase();
|
|
|
|
protected:
|
|
virtual ~MozMtpServer() {}
|
|
|
|
private:
|
|
RefPtr<RefCountedMtpServer> mMtpServer;
|
|
RefPtr<MozMtpDatabase> mMozMtpDatabase;
|
|
nsCOMPtr<nsIThread> mServerThread;
|
|
ScopedClose mMtpUsbFd;
|
|
};
|
|
|
|
END_MTP_NAMESPACE
|
|
|
|
#endif // mozilla_system_mozmtpserver_h__
|
|
|
|
|