mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-05 16:46:26 +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
99 lines
3.0 KiB
C++
99 lines
3.0 KiB
C++
/* 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/. */
|
|
|
|
#include "gfxReusableSharedImageSurfaceWrapper.h"
|
|
#include "gfxSharedImageSurface.h"
|
|
#include "mozilla/layers/ISurfaceAllocator.h"
|
|
|
|
using mozilla::ipc::Shmem;
|
|
using mozilla::layers::ISurfaceAllocator;
|
|
|
|
gfxReusableSharedImageSurfaceWrapper::gfxReusableSharedImageSurfaceWrapper(ISurfaceAllocator* aAllocator,
|
|
gfxSharedImageSurface* aSurface)
|
|
: mAllocator(aAllocator)
|
|
, mSurface(aSurface)
|
|
{
|
|
MOZ_COUNT_CTOR(gfxReusableSharedImageSurfaceWrapper);
|
|
ReadLock();
|
|
}
|
|
|
|
gfxReusableSharedImageSurfaceWrapper::~gfxReusableSharedImageSurfaceWrapper()
|
|
{
|
|
MOZ_COUNT_DTOR(gfxReusableSharedImageSurfaceWrapper);
|
|
ReadUnlock();
|
|
}
|
|
|
|
void
|
|
gfxReusableSharedImageSurfaceWrapper::ReadLock()
|
|
{
|
|
NS_ASSERT_OWNINGTHREAD(gfxReusableSharedImageSurfaceWrapper);
|
|
mSurface->ReadLock();
|
|
}
|
|
|
|
void
|
|
gfxReusableSharedImageSurfaceWrapper::ReadUnlock()
|
|
{
|
|
int32_t readCount = mSurface->ReadUnlock();
|
|
MOZ_ASSERT(readCount >= 0, "Read count should not be negative");
|
|
|
|
if (readCount == 0) {
|
|
mAllocator->DeallocShmem(mSurface->GetShmem());
|
|
}
|
|
}
|
|
|
|
gfxReusableSurfaceWrapper*
|
|
gfxReusableSharedImageSurfaceWrapper::GetWritable(gfxImageSurface** aSurface)
|
|
{
|
|
NS_ASSERT_OWNINGTHREAD(gfxReusableSharedImageSurfaceWrapper);
|
|
|
|
int32_t readCount = mSurface->GetReadCount();
|
|
MOZ_ASSERT(readCount > 0, "A ReadLock must be held when calling GetWritable");
|
|
if (readCount == 1) {
|
|
*aSurface = mSurface;
|
|
return this;
|
|
}
|
|
|
|
// Something else is reading the surface, copy it
|
|
RefPtr<gfxSharedImageSurface> copySurface =
|
|
gfxSharedImageSurface::CreateUnsafe(mAllocator.get(), mSurface->GetSize(), mSurface->Format());
|
|
copySurface->CopyFrom(mSurface);
|
|
*aSurface = copySurface;
|
|
|
|
// We need to create a new wrapper since this wrapper has an external ReadLock
|
|
gfxReusableSurfaceWrapper* wrapper = new gfxReusableSharedImageSurfaceWrapper(mAllocator, copySurface);
|
|
|
|
// No need to release the ReadLock on the surface, this will happen when
|
|
// the wrapper is destroyed.
|
|
|
|
return wrapper;
|
|
}
|
|
|
|
const unsigned char*
|
|
gfxReusableSharedImageSurfaceWrapper::GetReadOnlyData() const
|
|
{
|
|
MOZ_ASSERT(mSurface->GetReadCount() > 0, "Should have read lock");
|
|
return mSurface->Data();
|
|
}
|
|
|
|
gfxImageFormat
|
|
gfxReusableSharedImageSurfaceWrapper::Format()
|
|
{
|
|
return mSurface->Format();
|
|
}
|
|
|
|
Shmem&
|
|
gfxReusableSharedImageSurfaceWrapper::GetShmem()
|
|
{
|
|
return mSurface->GetShmem();
|
|
}
|
|
|
|
/* static */ already_AddRefed<gfxReusableSharedImageSurfaceWrapper>
|
|
gfxReusableSharedImageSurfaceWrapper::Open(ISurfaceAllocator* aAllocator, const Shmem& aShmem)
|
|
{
|
|
RefPtr<gfxSharedImageSurface> sharedImage = gfxSharedImageSurface::Open(aShmem);
|
|
RefPtr<gfxReusableSharedImageSurfaceWrapper> wrapper = new gfxReusableSharedImageSurfaceWrapper(aAllocator, sharedImage);
|
|
wrapper->ReadUnlock();
|
|
return wrapper.forget();
|
|
}
|