Bug 916714 - Fix a faulty assertion in TextureHost. r=jrmuizel, a=lsblakk
authorBenoit Jacob <bjacob@mozilla.com>
Tue, 17 Sep 2013 17:42:56 -0400
changeset 160345 04a42db395f2eb54c31e19731990518ce61bfd59
parent 160344 1eee5e8e71332d8098912164ee635952de45d525
child 160346 a32fcd93d0b2d44622e0f1b690ffb7ee61ded8d3
push id2961
push userlsblakk@mozilla.com
push dateMon, 28 Oct 2013 21:59:28 +0000
treeherdermozilla-beta@73ef4f13486f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjrmuizel, lsblakk
bugs916714
milestone26.0a2
Bug 916714 - Fix a faulty assertion in TextureHost. r=jrmuizel, a=lsblakk
gfx/layers/composite/TextureHost.h
--- a/gfx/layers/composite/TextureHost.h
+++ b/gfx/layers/composite/TextureHost.h
@@ -704,17 +704,17 @@ public:
    * allocator/de-allocator for the DeprecatedTextureHost, you cause the DeprecatedTextureHost to
    * retain a SurfaceDescriptor.
    * Ownership of the SurfaceDescriptor passes to this.
    */
   // only made virtual to allow overriding in GrallocDeprecatedTextureHostOGL, for hacky fix in gecko 23 for bug 862324.
   // see bug 865908 about fixing this.
   virtual void SetBuffer(SurfaceDescriptor* aBuffer, ISurfaceAllocator* aAllocator)
   {
-    MOZ_ASSERT(!mBuffer, "Will leak the old mBuffer");
+    MOZ_ASSERT(!mBuffer || mBuffer == aBuffer, "Will leak the old mBuffer");
     mBuffer = aBuffer;
     mDeAllocator = aAllocator;
   }
 
   // used only for hacky fix in gecko 23 for bug 862324
   // see bug 865908 about fixing this.
   virtual void ForgetBuffer() {}