зеркало из https://github.com/mozilla/gecko-dev.git
Backed out changeset 67b98c1c0b7b (bug 910415) for OSX leaks.
This commit is contained in:
Родитель
267315677a
Коммит
04eab425b0
|
@ -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) {
|
||||
|
|
|
@ -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,
|
||||
|
|
Загрузка…
Ссылка в новой задаче