Bug 1145295 - Update assertion to allow for transaction id resets. r=mattwoodrow, a=lmandel
authorKartikaya Gupta <kgupta@mozilla.com>
Fri, 17 Jul 2015 08:58:00 -0400
changeset 281590 6c85547293b4f83d5d9e48f092e85fcce0ea3f7e
parent 281589 8ac1cdef68f1bbc7c7f66bbbd98ec9d84c5d3521
child 281591 20553f5788f37213b7ff74e13d70b3a2abb0725b
push id4932
push userjlund@mozilla.com
push dateMon, 10 Aug 2015 18:23:06 +0000
treeherdermozilla-beta@6dd5a4f5f745 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmattwoodrow, lmandel
bugs1145295
milestone41.0a2
Bug 1145295 - Update assertion to allow for transaction id resets. r=mattwoodrow, a=lmandel
gfx/layers/ipc/CompositorParent.cpp
--- a/gfx/layers/ipc/CompositorParent.cpp
+++ b/gfx/layers/ipc/CompositorParent.cpp
@@ -1241,17 +1241,20 @@ CompositorParent::ShadowLayersUpdated(La
   mLayerManager->SetRoot(root);
 
   if (mApzcTreeManager && !aIsRepeatTransaction) {
     AutoResolveRefLayers resolve(mCompositionManager);
     mApzcTreeManager->UpdateHitTestingTree(this, root, aIsFirstPaint,
         mRootLayerTreeID, aPaintSequenceNumber);
   }
 
-  MOZ_ASSERT(aTransactionId > mPendingTransaction);
+  // The transaction ID might get reset to 1 if the page gets reloaded, see
+  // https://bugzilla.mozilla.org/show_bug.cgi?id=1145295#c41
+  // Otherwise, it should be continually increasing.
+  MOZ_ASSERT(aTransactionId == 1 || aTransactionId > mPendingTransaction);
   mPendingTransaction = aTransactionId;
 
   if (root) {
     SetShadowProperties(root);
   }
   if (aScheduleComposite) {
     ScheduleComposition();
     if (mPaused) {