mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-24 13:21:05 +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
101 lines
2.3 KiB
C++
101 lines
2.3 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.
|
|
*/
|
|
|
|
#include <dbus/dbus.h>
|
|
#include "nsAutoPtr.h"
|
|
#include "DBusUtils.h"
|
|
|
|
#undef CHROMIUM_LOG
|
|
#if defined(MOZ_WIDGET_GONK)
|
|
#include <android/log.h>
|
|
#define CHROMIUM_LOG(args...) __android_log_print(ANDROID_LOG_INFO, "Gonk", args);
|
|
#else
|
|
#define CHROMIUM_LOG(args...) printf(args);
|
|
#endif
|
|
|
|
namespace mozilla {
|
|
namespace ipc {
|
|
|
|
//
|
|
// DBusMessageRefPtr
|
|
//
|
|
|
|
DBusMessageRefPtr::DBusMessageRefPtr(DBusMessage* aMsg)
|
|
: mMsg(aMsg)
|
|
{
|
|
if (mMsg) {
|
|
dbus_message_ref(mMsg);
|
|
}
|
|
}
|
|
|
|
DBusMessageRefPtr::~DBusMessageRefPtr()
|
|
{
|
|
if (mMsg) {
|
|
dbus_message_unref(mMsg);
|
|
}
|
|
}
|
|
|
|
//
|
|
// DBusReplyHandler
|
|
//
|
|
|
|
void DBusReplyHandler::Callback(DBusMessage* aReply, void* aData)
|
|
{
|
|
MOZ_ASSERT(aData);
|
|
|
|
RefPtr<DBusReplyHandler> handler =
|
|
already_AddRefed<DBusReplyHandler>(static_cast<DBusReplyHandler*>(aData));
|
|
|
|
handler->Handle(aReply);
|
|
}
|
|
|
|
//
|
|
// Utility functions
|
|
//
|
|
|
|
void
|
|
log_and_free_dbus_error(DBusError* err, const char* function, DBusMessage* msg)
|
|
{
|
|
if (msg) {
|
|
CHROMIUM_LOG("%s: D-Bus error in %s: %s (%s)", function,
|
|
dbus_message_get_member((msg)), (err)->name, (err)->message);
|
|
} else {
|
|
CHROMIUM_LOG("%s: D-Bus error: %s (%s)", __FUNCTION__,
|
|
(err)->name, (err)->message);
|
|
}
|
|
dbus_error_free((err));
|
|
}
|
|
|
|
int dbus_returns_int32(DBusMessage *reply)
|
|
{
|
|
DBusError err;
|
|
int32_t ret = -1;
|
|
|
|
dbus_error_init(&err);
|
|
if (!dbus_message_get_args(reply, &err,
|
|
DBUS_TYPE_INT32, &ret,
|
|
DBUS_TYPE_INVALID)) {
|
|
LOG_AND_FREE_DBUS_ERROR_WITH_MSG(&err, reply);
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
}
|
|
}
|