Bug 1127405 - Remove the ForceRemove in CanvasClientSharedSurface to prevent crash. r=nical, a=sledru
authorEthan Lin <etlin@mozilla.com>
Tue, 03 Feb 2015 18:15:00 +0100
changeset 243717 7a8703c465a7
parent 243716 b5b3f7d712a9
child 243718 7733cfbb59a6
push id4449
push userryanvm@gmail.com
push date2015-02-09 15:46 +0000
treeherdermozilla-beta@130e59d97b15 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnical, sledru
bugs1127405
milestone36.0
Bug 1127405 - Remove the ForceRemove in CanvasClientSharedSurface to prevent crash. r=nical, a=sledru
gfx/layers/client/CanvasClient.cpp
--- a/gfx/layers/client/CanvasClient.cpp
+++ b/gfx/layers/client/CanvasClient.cpp
@@ -399,22 +399,16 @@ CanvasClientSharedSurface::Update(gfx::I
 
   forwarder->UpdatedTexture(this, mFrontTex, nullptr);
   forwarder->UseTexture(this, mFrontTex);
 }
 
 void
 CanvasClientSharedSurface::ClearSurfaces()
 {
-  if (mFrontTex && (mFront || mPrevFront)) {
-    // Force a synchronous destruction so that the TextureHost does not
-    // outlive the SharedSurface. This won't be needed once TextureClient/Host
-    // and SharedSurface are merged.
-    mFrontTex->ForceRemove(true /* sync */);
-    mFrontTex = nullptr;
-  }
+  mFrontTex = nullptr;
   // It is important to destroy the SharedSurface *after* the TextureClient.
   mFront = nullptr;
   mPrevFront = nullptr;
 }
 
 }
 }