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 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 a7dfb76c5f
commit f95ecf3499
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,