Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 07:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 67b98c1c0b7b (bug 910415) for OSX leaks.

Browse Source
This commit is contained in:
Ryan VanderMeulen 2013-08-29 14:58:56 -04:00
parent 267315677a
commit 04eab425b0
2 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gfx/layers/composite/ImageHost.cpp
View File

@ -212,7 +212,9 @@ DeprecatedImageHostSingle::EnsureDeprecatedTextureHost(TextureIdentifier aTextur
ISurfaceAllocator* aAllocator,
const TextureInfo& aTextureInfo)
{
if (mDeprecatedTextureHost) {
if (mDeprecatedTextureHost &&
mDeprecatedTextureHost->GetBuffer() &&
mDeprecatedTextureHost->GetBuffer()->type() == aSurface.type()) {
return;
}
@ -343,24 +345,6 @@ DeprecatedImageHostSingle::PrintInfo(nsACString& aTo, const char* aPrefix)
}
#endif
void
DeprecatedImageHostBuffered::EnsureDeprecatedTextureHost(TextureIdentifier aTextureId,
const SurfaceDescriptor& aSurface,
ISurfaceAllocator* aAllocator,
const TextureInfo& aTextureInfo)
{
if (mDeprecatedTextureHost &&
mDeprecatedTextureHost->GetBuffer() &&
mDeprecatedTextureHost->GetBuffer()->type() == aSurface.type()) {
return;
}
MakeDeprecatedTextureHost(aTextureId,
aSurface,
aAllocator,
aTextureInfo);
}
bool
DeprecatedImageHostBuffered::Update(const SurfaceDescriptor& aImage,
SurfaceDescriptor* aResult) {

4
gfx/layers/composite/ImageHost.h
View File

@ -168,10 +168,6 @@ public:
SurfaceDescriptor* aResult = nullptr) MOZ_OVERRIDE;
protected:
virtual void EnsureDeprecatedTextureHost(TextureIdentifier aTextureId,
const SurfaceDescriptor& aSurface,
ISurfaceAllocator* aAllocator,
const TextureInfo& aTextureInfo) MOZ_OVERRIDE;
virtual void MakeDeprecatedTextureHost(TextureIdentifier aTextureId,
const SurfaceDescriptor& aSurface,
ISurfaceAllocator* aAllocator,