mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-19 08:15:31 +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
112 lines
2.4 KiB
C++
112 lines
2.4 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
|
* vim: sw=2 ts=8 et :
|
|
*/
|
|
/* 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/. */
|
|
|
|
#if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 17
|
|
#pragma GCC visibility push(default)
|
|
#include "sync/sync.h" // for sync_merge
|
|
#pragma GCC visibility pop
|
|
#endif
|
|
|
|
#include "FenceUtils.h"
|
|
|
|
using namespace mozilla::layers;
|
|
|
|
namespace IPC {
|
|
|
|
void
|
|
ParamTraits<FenceHandle>::Write(Message* aMsg,
|
|
const paramType& aParam)
|
|
{
|
|
FenceHandle handle = aParam;
|
|
|
|
MOZ_ASSERT(handle.IsValid());
|
|
|
|
#if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 17
|
|
RefPtr<FenceHandle::FdObj> fence = handle.GetAndResetFdObj();
|
|
aMsg->WriteFileDescriptor(base::FileDescriptor(fence->GetAndResetFd(), true));
|
|
#endif
|
|
}
|
|
|
|
bool
|
|
ParamTraits<FenceHandle>::Read(const Message* aMsg,
|
|
void** aIter, paramType* aResult)
|
|
{
|
|
#if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 17
|
|
base::FileDescriptor fd;
|
|
if (aMsg->ReadFileDescriptor(aIter, &fd)) {
|
|
aResult->Merge(FenceHandle(new FenceHandle::FdObj(fd.fd)));
|
|
}
|
|
#endif
|
|
return true;
|
|
}
|
|
|
|
} // namespace IPC
|
|
|
|
namespace mozilla {
|
|
namespace layers {
|
|
|
|
FenceHandle::FenceHandle()
|
|
: mFence(new FdObj())
|
|
{
|
|
}
|
|
|
|
FenceHandle::FenceHandle(FdObj* aFdObj)
|
|
: mFence(aFdObj)
|
|
{
|
|
MOZ_ASSERT(aFdObj);
|
|
}
|
|
|
|
void
|
|
FenceHandle::Merge(const FenceHandle& aFenceHandle)
|
|
{
|
|
#if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 17
|
|
if (!aFenceHandle.IsValid()) {
|
|
return;
|
|
}
|
|
|
|
if (!IsValid()) {
|
|
mFence = aFenceHandle.mFence;
|
|
} else {
|
|
int result = sync_merge("FenceHandle", mFence->mFd, aFenceHandle.mFence->mFd);
|
|
if (result == -1) {
|
|
mFence = aFenceHandle.mFence;
|
|
} else {
|
|
mFence = new FdObj(result);
|
|
}
|
|
}
|
|
#endif
|
|
}
|
|
|
|
void
|
|
FenceHandle::TransferToAnotherFenceHandle(FenceHandle& aFenceHandle)
|
|
{
|
|
aFenceHandle.mFence = this->GetAndResetFdObj();
|
|
}
|
|
|
|
already_AddRefed<FenceHandle::FdObj>
|
|
FenceHandle::GetAndResetFdObj()
|
|
{
|
|
RefPtr<FdObj> fence = mFence;
|
|
mFence = new FdObj();
|
|
return fence.forget();
|
|
}
|
|
|
|
already_AddRefed<FenceHandle::FdObj>
|
|
FenceHandle::GetDupFdObj()
|
|
{
|
|
RefPtr<FdObj> fdObj;
|
|
if (IsValid()) {
|
|
fdObj = new FenceHandle::FdObj(dup(mFence->mFd));
|
|
} else {
|
|
fdObj = new FenceHandle::FdObj();
|
|
}
|
|
return fdObj.forget();
|
|
}
|
|
|
|
} // namespace layers
|
|
} // namespace mozilla
|