wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 980885 - Fix more Moz2D D2D mapping code that fails to set/reset mIsMapped. r=Bas

Browse Source
This commit is contained in:
Jonathan Watt 2014-03-07 13:24:47 +00:00
parent 9c80b2ba26
commit 705e519aba
2 changed files with 41 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
gfx/2d/DataSurfaceHelpers.cpp
View File

@ -26,6 +26,28 @@ ConvertBGRXToBGRA(uint8_t* aData, const IntSize &aSize, int32_t aStride)
}
}
void
CopySurfaceDataToPackedArray(uint8_t* aSrc, uint8_t* aDst, IntSize aSrcSize,
int32_t aSrcStride, int32_t aBytesPerPixel)
{
MOZ_ASSERT(aBytesPerPixel > 0,
"Negative stride for aDst not currently supported");
int packedStride = aSrcSize.width * aBytesPerPixel;
if (aSrcStride == packedStride) {
// aSrc is already packed, so we can copy with a single memcpy.
memcpy(aDst, aSrc, packedStride * aSrcSize.height);
} else {
// memcpy one row at a time.
for (int row = 0; row < aSrcSize.height; ++row) {
memcpy(aDst, aSrc, packedStride);
aSrc += aSrcStride;
aDst += packedStride;
}
}
}
uint8_t*
SurfaceToPackedBGRA(DataSourceSurface *aSurface)
{
@ -41,23 +63,17 @@ SurfaceToPackedBGRA(DataSourceSurface *aSurface)
return nullptr;
}
size_t stride = aSurface->Stride();
uint32_t* src = reinterpret_cast<uint32_t*>(aSurface->GetData());
uint32_t* dst = reinterpret_cast<uint32_t*>(imageBuffer);
if (stride == size.width * sizeof(uint32_t)) {
// DataSourceSurface is already packed. We can use memcpy.
memcpy(dst, src, size.width * size.height * sizeof(uint32_t));
} else {
for (int row = 0; row < size.height; ++row) {
for (int column = 0; column < size.width; ++column) {
*dst++ = src[column];
}
src += (stride/4);
}
DataSourceSurface::MappedSurface map;
if (!aSurface->Map(DataSourceSurface::MapType::READ, &map)) {
delete [] imageBuffer;
return nullptr;
}
CopySurfaceDataToPackedArray(map.mData, imageBuffer, size,
map.mStride, 4 * sizeof(uint8_t));
aSurface->Unmap();
if (format == SurfaceFormat::B8G8R8X8) {
// Convert BGRX to BGRA by setting a to 255.
ConvertBGRXToBGRA(reinterpret_cast<uint8_t *>(imageBuffer), size, size.width * sizeof(uint32_t));

10
gfx/2d/DataSurfaceHelpers.h
View File

@ -13,6 +13,16 @@ namespace gfx {
void
ConvertBGRXToBGRA(uint8_t* aData, const IntSize &aSize, int32_t aStride);
/**
* Copy the pixel data from aSrc and pack it into aDst. aSrcSize, aSrcStride
* and aBytesPerPixel give the size, stride and bytes per pixel for aSrc's
* surface. Callers are responsible for making sure that aDst is big enough to
* contain |aSrcSize.width * aSrcSize.height * aBytesPerPixel| bytes.
*/
void
CopySurfaceDataToPackedArray(uint8_t* aSrc, uint8_t* aDst, IntSize aSrcSize,
int32_t aSrcStride, int32_t aBytesPerPixel);
/**
* Convert aSurface to a packed buffer in BGRA format. The pixel data is
* returned in a buffer allocated with new uint8_t[].