Bug 1462497 - Follow-up to fix code that was accidentally inside a MOZ_DIAGNOSTIC_ASSERT_ENABLED block. a=RyanVM
authorMatt Woodrow <mwoodrow@mozilla.com>
Fri, 25 May 2018 09:56:28 +1200
changeset 470924 bb4d7af3e4ab0ff4e327bc9975d1671009e9d6c5
parent 470923 3b746f7885d7a1567658cb38207dd2efc87a6785
child 470925 37d3889a39a9672bf365b7ea04c34f6d2fd269ba
push id9267
push userryanvm@gmail.com
push dateFri, 25 May 2018 16:08:23 +0000
treeherdermozilla-beta@bb4d7af3e4ab [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersRyanVM
bugs1462497
milestone61.0
Bug 1462497 - Follow-up to fix code that was accidentally inside a MOZ_DIAGNOSTIC_ASSERT_ENABLED block. a=RyanVM
layout/painting/nsDisplayList.h
--- a/layout/painting/nsDisplayList.h
+++ b/layout/painting/nsDisplayList.h
@@ -2843,20 +2843,20 @@ public:
   mozilla::DisplayItemData* GetDisplayItemData() { return mDisplayItemData; }
 
   // Set the nsDisplayList that this item belongs to, and what
   // index it is within that list. Temporary state for merging
   // used by RetainedDisplayListBuilder.
   void SetOldListIndex(nsDisplayList* aList, OldListIndex aIndex, uint32_t aListKey, uint32_t aNestingDepth)
   {
 #ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
-    mOldList = reinterpret_cast<uintptr_t>(aList);
     mOldListKey = aListKey;
     mOldNestingDepth = aNestingDepth;
 #endif
+    mOldList = reinterpret_cast<uintptr_t>(aList);
     mOldListIndex = aIndex;
   }
   bool GetOldListIndex(nsDisplayList* aList, uint32_t aListKey, OldListIndex* aOutIndex)
   {
     if (mOldList != reinterpret_cast<uintptr_t>(aList)) {
 #ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
       MOZ_CRASH_UNSAFE_PRINTF("Item found was in the wrong list! type %d (outer type was %d at depth %d, now is %d)", GetPerFrameKey(), mOldListKey, mOldNestingDepth, aListKey);
 #endif