From 04eab425b04e8277b4890e6ac90d2d200d51ca63 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Thu, 29 Aug 2013 14:58:56 -0400
Subject: [PATCH] Backed out changeset 67b98c1c0b7b (bug 910415) for OSX leaks.

---
 gfx/layers/composite/ImageHost.cpp | 22 +++-------------------
 gfx/layers/composite/ImageHost.h   |  4 ----
 2 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/gfx/layers/composite/ImageHost.cpp b/gfx/layers/composite/ImageHost.cpp
index b751d8fba145..0da1722781fb 100644
--- a/gfx/layers/composite/ImageHost.cpp
+++ b/gfx/layers/composite/ImageHost.cpp
@@ -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) {
diff --git a/gfx/layers/composite/ImageHost.h b/gfx/layers/composite/ImageHost.h
index 1a1c44419b14..03005d7118f6 100644
--- a/gfx/layers/composite/ImageHost.h
+++ b/gfx/layers/composite/ImageHost.h
@@ -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,