Fix revoking transactions that may not have been started. (bug 1314399, r=nical)
authorDavid Anderson <danderson@mozilla.com>
Tue, 08 Nov 2016 13:12:46 -0800
changeset 348439 494b13143c3eb904f2c42300d0b43bbc486c5f2d
parent 348438 138f4cfcbd9db30b15183d337e8d595a57ba9af4
child 348440 cc389e9b7883531b91dc9885f1261737c3c0f4bc
push id10298
push userraliiev@mozilla.com
push dateMon, 14 Nov 2016 12:33:03 +0000
treeherdermozilla-aurora@7e29173b1641 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnical
bugs1314399
milestone52.0a1
Fix revoking transactions that may not have been started. (bug 1314399, r=nical)
gfx/layers/client/ClientLayerManager.cpp
--- a/gfx/layers/client/ClientLayerManager.cpp
+++ b/gfx/layers/client/ClientLayerManager.cpp
@@ -352,17 +352,16 @@ ClientLayerManager::StorePluginWidgetCon
 }
 
 void
 ClientLayerManager::EndTransaction(DrawPaintedLayerCallback aCallback,
                                    void* aCallbackData,
                                    EndTransactionFlags aFlags)
 {
   if (!mForwarder->IPCOpen()) {
-    mTransactionIdAllocator->RevokeTransactionId(mLatestTransactionId);
     mInTransaction = false;
     return;
   }
 
   if (mWidget) {
     mWidget->PrepareWindowEffects();
   }
   EndTransactionInternal(aCallback, aCallbackData, aFlags);
@@ -384,17 +383,16 @@ ClientLayerManager::EndTransaction(DrawP
 }
 
 bool
 ClientLayerManager::EndEmptyTransaction(EndTransactionFlags aFlags)
 {
   mInTransaction = false;
 
   if (!mRoot || !mForwarder->IPCOpen()) {
-    mTransactionIdAllocator->RevokeTransactionId(mLatestTransactionId);
     return false;
   }
 
   if (!EndTransactionInternal(nullptr, nullptr, aFlags)) {
     // Return without calling ForwardTransaction. This leaves the
     // ShadowLayerForwarder transaction open; the following
     // EndTransaction will complete it.
     return false;