corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backout 85d108f0b422 (bug 874369) for causing b2g reftest failures.

Browse Source
This commit is contained in:
Matt Woodrow
2013-05-22 13:18:19 +08:00
parent e664a12171
commit 42f08603d4
7 changed files with 3 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gfx/layers/ipc/ShadowLayerUtilsMac.cpp
View File

@@ -32,22 +32,10 @@ ISurfaceAllocator::PlatformAllocSurfaceDescriptor(const gfxIntSize& aSize,
ShadowLayerForwarder::PlatformOpenDescriptor(OpenMode aMode,
const SurfaceDescriptor& aSurface)
{
if (aSurface.type() == SurfaceDescriptor::TShmem) {
return gfxSharedQuartzSurface::Open(aSurface.get_Shmem());
} else if (aSurface.type() == SurfaceDescriptor::TMemoryImage) {
const MemoryImage& image = aSurface.get_MemoryImage();
gfxASurface::gfxImageFormat format
= static_cast<gfxASurface::gfxImageFormat>(image.format());
nsRefPtr<gfxASurface> surf =
new gfxQuartzSurface((unsigned char*)image.data(),
image.size(),
image.stride(),
format);
return surf.forget();
if (SurfaceDescriptor::TShmem != aSurface.type()) {
return nullptr;
}
return nullptr;
return gfxSharedQuartzSurface::Open(aSurface.get_Shmem());
}
/*static*/ bool