Backed out changeset cbe947863ad3 (bug 854421)

gfx/layers/client/ClientLayerManager.cpp

@@ -40,7 +40,6 @@ using namespace mozilla::gfx;
 ClientLayerManager::ClientLayerManager(nsIWidget* aWidget)
   : mPhase(PHASE_NONE)
   , mWidget(aWidget)
-  , mLatestTransactionId(0)
   , mTargetRotation(ROTATION_0)
   , mRepeatTransaction(false)
   , mIsRepeatTransaction(false)
@@ -55,9 +54,6 @@ ClientLayerManager::ClientLayerManager(nsIWidget* aWidget)
 
 ClientLayerManager::~ClientLayerManager()
 {
-  if (mTransactionIdAllocator) {
-    DidComposite(mLatestTransactionId);
-  }
   ClearCachedResources();
   // Stop receiveing AsyncParentMessage at Forwarder.
   // After the call, the message is directly handled by LayerTransactionChild. 
@@ -426,13 +422,13 @@ ClientLayerManager::ForwardTransaction(bool aScheduleComposite)
 {
   mPhase = PHASE_FORWARD;
 
-  mLatestTransactionId = mTransactionIdAllocator->GetTransactionId();
+  uint64_t pendingTransactionId = mTransactionIdAllocator->GetTransactionId();
 
   // forward this transaction's changeset to our LayerManagerComposite
   bool sent;
   AutoInfallibleTArray<EditReply, 10> replies;
   if (HasShadowManager() && mForwarder->EndTransaction(&replies, mRegionToClear,
-        mLatestTransactionId, aScheduleComposite, mPaintSequenceNumber, &sent)) {
+        pendingTransactionId, aScheduleComposite, mPaintSequenceNumber, &sent)) {
     for (nsTArray<EditReply>::size_type i = 0; i < replies.Length(); ++i) {
       const EditReply& reply = replies[i];
 
@@ -490,7 +486,7 @@ ClientLayerManager::ForwardTransaction(bool aScheduleComposite)
       // Clear the transaction id so that it doesn't get returned
       // unless we forwarded to somewhere that doesn't actually
       // have a compositor.
-      mTransactionIdAllocator->RevokeTransactionId(mLatestTransactionId);
+      mTransactionIdAllocator->RevokeTransactionId(pendingTransactionId);
     }
   } else if (HasShadowManager()) {
     NS_WARNING("failed to forward Layers transaction");

gfx/layers/client/ClientLayerManager.h

@@ -257,7 +257,6 @@ private:
   nsRefPtr<gfxContext> mShadowTarget;
 
   nsRefPtr<TransactionIdAllocator> mTransactionIdAllocator;
-  uint64_t mLatestTransactionId;
 
   // Sometimes we draw to targets that don't natively support
   // landscape/portrait orientation.  When we need to implement that

layout/base/nsRefreshDriver.cpp

@@ -1385,9 +1385,8 @@ void
 nsRefreshDriver::FinishedWaitingForTransaction()
 {
   mWaitingForTransaction = false;
-  if (mSkippedPaint &&
-      !IsInRefresh() &&
-      (ObserverCount() || ImageRequestCount())) {
+  if (mSkippedPaint && (ObserverCount() || ImageRequestCount())) {
+    MOZ_ASSERT(!IsInRefresh());
     DoRefresh();
   }
   mSkippedPaint = false;