Bug 991028 - Remove deprecated IPDL SurfaceDescriptor types. r=nical

This commit is contained in:
Matt Woodrow
2014-04-07 13:32:49 +12:00
parent dc383bca70
commit ea5c198fb6
14 changed files with 49 additions and 212 deletions

View File

@@ -36,12 +36,7 @@ public:
virtual void DeallocateSharedData(ISurfaceAllocator* allocator) MOZ_OVERRIDE
{
// We just need to wrap the actor in a SurfaceDescriptor because that's what
// ISurfaceAllocator uses as input, we don't care about the other parameters.
SurfaceDescriptor sd = SurfaceDescriptorGralloc(nullptr, mGrallocActor,
IntSize(0, 0),
false, false);
allocator->DestroySharedSurface(&sd);
allocator->DeallocGrallocBuffer(mGrallocActor);
mGrallocActor = nullptr;
}
@@ -85,16 +80,8 @@ GrallocTextureClientOGL::~GrallocTextureClientOGL()
{
MOZ_COUNT_DTOR(GrallocTextureClientOGL);
if (ShouldDeallocateInDestructor()) {
// If the buffer has never been shared we must deallocate it or it would
// leak.
// We just need to wrap the actor in a SurfaceDescriptor because that's what
// ISurfaceAllocator uses as input, we don't care about the other parameters.
SurfaceDescriptor sd = SurfaceDescriptorGralloc(nullptr, mGrallocActor,
IntSize(0, 0),
false, false);
ISurfaceAllocator* allocator = GetAllocator();
allocator->DestroySharedSurface(&sd);
allocator->DeallocGrallocBuffer(mGrallocActor);
}
}