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

Backed out changesets aed22a2d8353 and c61fe8e1f887 (bug 908006) for OSX reftest failures.

Browse Source
This commit is contained in:
Ryan VanderMeulen 2013-08-23 15:45:27 -04:00
parent 06ce771f6f
commit c8e81dd315
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gfx/layers/ImageDataSerializer.cpp
View File

@ -62,17 +62,13 @@ ImageDataSerializer::InitializeBufferInfo(gfx::IntSize aSize,
info->format = aFormat; info->format = aFormat;
} }
static inline uint32_t
ComputeStride(gfx::SurfaceFormat aFormat, uint32_t aWidth)
{
return gfx::GetAlignedStride<4>(gfx::BytesPerPixel(aFormat) * aWidth);
}
uint32_t uint32_t
ImageDataSerializer::ComputeMinBufferSize(gfx::IntSize aSize, ImageDataSerializer::ComputeMinBufferSize(gfx::IntSize aSize,
gfx::SurfaceFormat aFormat) gfx::SurfaceFormat aFormat)
{ {
uint32_t bufsize = aSize.height * ComputeStride(aFormat, aSize.width); // Note that at the moment we pack the image data with the minimum possible
// stride, we may decide to change that if we want aligned stride.
uint32_t bufsize = aSize.height * gfx::BytesPerPixel(aFormat) * aSize.width;
return SurfaceBufferInfo::GetOffset() return SurfaceBufferInfo::GetOffset()
+ gfx::GetAlignedStride<16>(bufsize); + gfx::GetAlignedStride<16>(bufsize);
} }
@ -111,7 +107,8 @@ ImageDataSerializerBase::GetAsThebesSurface()
{ {
MOZ_ASSERT(IsValid()); MOZ_ASSERT(IsValid());
SurfaceBufferInfo* info = GetBufferInfo(mData); SurfaceBufferInfo* info = GetBufferInfo(mData);
uint32_t stride = ComputeStride(GetFormat(), info->width); uint32_t stride = gfxASurface::BytesPerPixel(
gfx::SurfaceFormatToImageFormat(GetFormat())) * info->width;
gfxIntSize size(info->width, info->height); gfxIntSize size(info->width, info->height);
RefPtr<gfxImageSurface> surf = RefPtr<gfxImageSurface> surf =
new gfxImageSurface(GetData(), size, stride, new gfxImageSurface(GetData(), size, stride,
@ -125,7 +122,8 @@ ImageDataSerializerBase::GetAsSurface()
MOZ_ASSERT(IsValid()); MOZ_ASSERT(IsValid());
SurfaceBufferInfo* info = GetBufferInfo(mData); SurfaceBufferInfo* info = GetBufferInfo(mData);
gfx::IntSize size(info->width, info->height); gfx::IntSize size(info->width, info->height);
uint32_t stride = ComputeStride(GetFormat(), info->width); uint32_t stride = gfxASurface::BytesPerPixel(
gfx::SurfaceFormatToImageFormat(GetFormat())) * info->width;
RefPtr<gfx::DataSourceSurface> surf = RefPtr<gfx::DataSourceSurface> surf =
gfx::Factory::CreateWrappingDataSourceSurface(GetData(), stride, size, GetFormat()); gfx::Factory::CreateWrappingDataSourceSurface(GetData(), stride, size, GetFormat());
return surf.forget(); return surf.forget();

4
gfx/layers/Layers.cpp
View File

@ -120,10 +120,6 @@ already_AddRefed<gfxASurface>
LayerManager::CreateOptimalSurface(const gfxIntSize &aSize, LayerManager::CreateOptimalSurface(const gfxIntSize &aSize,
gfxASurface::gfxImageFormat aFormat) gfxASurface::gfxImageFormat aFormat)
{ {
if (aFormat == gfxASurface::ImageFormatA8) {
nsRefPtr<gfxASurface> surf = new gfxImageSurface(aSize, aFormat);
return surf.forget();
}
return gfxPlatform::GetPlatform()-> return gfxPlatform::GetPlatform()->
CreateOffscreenSurface(aSize, gfxASurface::ContentFromFormat(aFormat)); CreateOffscreenSurface(aSize, gfxASurface::ContentFromFormat(aFormat));
} }