mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-12 21:05:36 +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
107 lines
2.5 KiB
C++
107 lines
2.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: */
|
|
/*
|
|
** Copyright 2006, The Android Open Source Project
|
|
**
|
|
** Licensed under the Apache License, Version 2.0 (the "License");
|
|
** you may not use this file except in compliance with the License.
|
|
** You may obtain a copy of the License at
|
|
**
|
|
** http://www.apache.org/licenses/LICENSE-2.0
|
|
**
|
|
** Unless required by applicable law or agreed to in writing, software
|
|
** distributed under the License is distributed on an "AS IS" BASIS,
|
|
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
** See the License for the specific language governing permissions and
|
|
** limitations under the License.
|
|
*/
|
|
|
|
#ifndef mozilla_ipc_dbus_dbusutils_h__
|
|
#define mozilla_ipc_dbus_dbusutils_h__
|
|
|
|
#include "mozilla/RefPtr.h"
|
|
|
|
// LOGE and free a D-Bus error
|
|
// Using #define so that __FUNCTION__ resolves usefully
|
|
#define LOG_AND_FREE_DBUS_ERROR_WITH_MSG(err, msg) log_and_free_dbus_error(err, __FUNCTION__, msg);
|
|
#define LOG_AND_FREE_DBUS_ERROR(err) log_and_free_dbus_error(err, __FUNCTION__);
|
|
|
|
struct DBusError;
|
|
struct DBusMessage;
|
|
|
|
namespace mozilla {
|
|
namespace ipc {
|
|
|
|
class DBusMessageRefPtr
|
|
{
|
|
public:
|
|
DBusMessageRefPtr(DBusMessage* aMsg);
|
|
~DBusMessageRefPtr();
|
|
|
|
operator DBusMessage* ()
|
|
{
|
|
return mMsg;
|
|
}
|
|
|
|
DBusMessage* get()
|
|
{
|
|
return mMsg;
|
|
}
|
|
|
|
private:
|
|
DBusMessage* mMsg;
|
|
};
|
|
|
|
/**
|
|
* DBusReplyHandler represents a handler for DBus reply messages. Inherit
|
|
* from this class and implement the Handle method. The method Callback
|
|
* should be passed to the DBus send function, with the class instance as
|
|
* user-data argument.
|
|
*/
|
|
class DBusReplyHandler
|
|
{
|
|
public:
|
|
NS_INLINE_DECL_THREADSAFE_REFCOUNTING(DBusReplyHandler)
|
|
|
|
/**
|
|
* Implements a call-back function for DBus. The supplied value for
|
|
* aData must be a pointer to an instance of DBusReplyHandler.
|
|
*/
|
|
static void Callback(DBusMessage* aReply, void* aData);
|
|
|
|
/**
|
|
* Call-back method for handling the reply message from DBus.
|
|
*/
|
|
virtual void Handle(DBusMessage* aReply) = 0;
|
|
|
|
protected:
|
|
DBusReplyHandler()
|
|
{
|
|
}
|
|
|
|
DBusReplyHandler(const DBusReplyHandler& aHandler)
|
|
{
|
|
}
|
|
|
|
DBusReplyHandler& operator = (const DBusReplyHandler& aRhs)
|
|
{
|
|
return *this;
|
|
}
|
|
|
|
virtual ~DBusReplyHandler()
|
|
{
|
|
}
|
|
};
|
|
|
|
void log_and_free_dbus_error(DBusError* err,
|
|
const char* function,
|
|
DBusMessage* msg = nullptr);
|
|
|
|
int dbus_returns_int32(DBusMessage *reply);
|
|
|
|
}
|
|
}
|
|
|
|
#endif
|
|
|