Bug 1137251 - Disable RemoveTextureFromCompositableTracker except gonk. r=nical, a=sledru
authorSotaro Ikeda <sikeda@mozilla.com>
Tue, 03 Mar 2015 08:51:05 -0800
changeset 245443 7e01afd0e736
parent 245442 e1a9cef7a5f6
child 245444 d3002e389444
push id675
push userryanvm@gmail.com
push date2015-03-03 19:16 +0000
treeherdermozilla-release@7e01afd0e736 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnical, sledru
bugs1137251
milestone36.0
Bug 1137251 - Disable RemoveTextureFromCompositableTracker except gonk. r=nical, a=sledru
gfx/layers/client/CanvasClient.cpp
--- a/gfx/layers/client/CanvasClient.cpp
+++ b/gfx/layers/client/CanvasClient.cpp
@@ -379,28 +379,30 @@ CanvasClientSharedSurface::Update(gfx::I
     // May happen in a release build in case of memory pressure.
     gfxCriticalError() << "Failed to allocate a TextureClient for SharedSurface Canvas. size: " << aSize;
     return;
   }
 
   // Add the new TexClient.
   MOZ_ALWAYS_TRUE( AddTextureClient(newTex) );
 
+#ifdef MOZ_WIDGET_GONK
   // Remove the old TexClient.
   if (mFrontTex) {
     // remove old buffer from CompositableHost
     RefPtr<AsyncTransactionTracker> tracker = new RemoveTextureFromCompositableTracker();
     // Hold TextureClient until transaction complete.
     tracker->SetTextureClient(mFrontTex);
     mFrontTex->SetRemoveFromCompositableTracker(tracker);
     // RemoveTextureFromCompositableAsync() expects CompositorChild's presence.
     GetForwarder()->RemoveTextureFromCompositableAsync(tracker, this, mFrontTex);
 
     mFrontTex = nullptr;
   }
+#endif
 
   // Use the new TexClient.
   mFrontTex = newTex;
 
   forwarder->UpdatedTexture(this, mFrontTex, nullptr);
   forwarder->UseTexture(this, mFrontTex);
 }