mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-14 13:55:43 +00:00
cd7cf0fad3
The shared memory handle reporting has been generalized to be an external handle reporting. This is used for both shared memory, and for volatile memory (on Android.) This will allow us to have a better sense of just how many handles are being used by images on Android. Additionally we were not properly reporting forced heap allocated memory, if we were putting animated frames on the heap. This is because we used SourceSurfaceAlignedRawData without implementing AddSizeOfExcludingThis.
93 lines
2.7 KiB
C++
93 lines
2.7 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=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/. */
|
|
|
|
#include "SourceSurfaceRawData.h"
|
|
|
|
#include "DataSurfaceHelpers.h"
|
|
#include "Logging.h"
|
|
#include "mozilla/Types.h" // for decltype
|
|
|
|
namespace mozilla {
|
|
namespace gfx {
|
|
|
|
void
|
|
SourceSurfaceRawData::InitWrappingData(uint8_t *aData,
|
|
const IntSize &aSize,
|
|
int32_t aStride,
|
|
SurfaceFormat aFormat,
|
|
Factory::SourceSurfaceDeallocator aDeallocator,
|
|
void* aClosure)
|
|
{
|
|
mRawData = aData;
|
|
mSize = aSize;
|
|
mStride = aStride;
|
|
mFormat = aFormat;
|
|
|
|
if (aDeallocator) {
|
|
mOwnData = true;
|
|
}
|
|
mDeallocator = aDeallocator;
|
|
mClosure = aClosure;
|
|
}
|
|
|
|
void
|
|
SourceSurfaceRawData::GuaranteePersistance()
|
|
{
|
|
if (mOwnData) {
|
|
return;
|
|
}
|
|
|
|
MOZ_ASSERT(!mDeallocator);
|
|
uint8_t* oldData = mRawData;
|
|
mRawData = new uint8_t[mStride * mSize.height];
|
|
|
|
memcpy(mRawData, oldData, mStride * mSize.height);
|
|
mOwnData = true;
|
|
}
|
|
|
|
bool
|
|
SourceSurfaceAlignedRawData::Init(const IntSize &aSize,
|
|
SurfaceFormat aFormat,
|
|
bool aClearMem,
|
|
uint8_t aClearValue,
|
|
int32_t aStride)
|
|
{
|
|
mFormat = aFormat;
|
|
mStride = aStride ? aStride : GetAlignedStride<16>(aSize.width, BytesPerPixel(aFormat));
|
|
|
|
size_t bufLen = BufferSizeFromStrideAndHeight(mStride, aSize.height);
|
|
if (bufLen > 0) {
|
|
bool zeroMem = aClearMem && !aClearValue;
|
|
static_assert(sizeof(decltype(mArray[0])) == 1,
|
|
"mArray.Realloc() takes an object count, so its objects must be 1-byte sized if we use bufLen");
|
|
|
|
// AlignedArray uses cmalloc to zero mem for a fast path.
|
|
mArray.Realloc(/* actually an object count */ bufLen, zeroMem);
|
|
mSize = aSize;
|
|
|
|
if (mArray && aClearMem && aClearValue) {
|
|
memset(mArray, aClearValue, mStride * aSize.height);
|
|
}
|
|
} else {
|
|
mArray.Dealloc();
|
|
mSize.SizeTo(0, 0);
|
|
}
|
|
|
|
return mArray != nullptr;
|
|
}
|
|
|
|
void
|
|
SourceSurfaceAlignedRawData::AddSizeOfExcludingThis(MallocSizeOf aMallocSizeOf,
|
|
size_t& aHeapSizeOut,
|
|
size_t& aNonHeapSizeOut,
|
|
size_t& aExtHandlesOut) const
|
|
{
|
|
aHeapSizeOut += mArray.HeapSizeOfExcludingThis(aMallocSizeOf);
|
|
}
|
|
|
|
} // namespace gfx
|
|
} // namespace mozilla
|