Bug 1455860 - Limit the diagnostic assert for mismatches between main thread and compositor hit testing to Nightly builds only. r=kats
authorBotond Ballo <botond@mozilla.com>
Thu, 26 Apr 2018 12:47:34 -0400
changeset 415899 57b4b1a4f2e60037a687c753c8f780b1a67d31fb
parent 415898 e4b2357330b4d5f20b306f57aa34e8f74dd45869
child 415900 a51257921d043d55d40971a0e865c6adb2474f91
push id33911
push usercsabou@mozilla.com
push dateFri, 27 Apr 2018 10:01:39 +0000
treeherdermozilla-central@822936017145 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskats
bugs1455860
milestone61.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1455860 - Limit the diagnostic assert for mismatches between main thread and compositor hit testing to Nightly builds only. r=kats MozReview-Commit-ID: 87DKkb7KmiC
gfx/layers/apz/src/InputBlockState.cpp
--- a/gfx/layers/apz/src/InputBlockState.cpp
+++ b/gfx/layers/apz/src/InputBlockState.cpp
@@ -63,17 +63,19 @@ InputBlockState::SetConfirmedTargetApzc(
   // however, we just silently accept the main thread's confirmed target,
   // which will produce the expected behaviour (apart from drag events
   // received so far being dropped).
   if (AsDragBlock() && aForScrollbarDrag &&
       mTargetConfirmed == TargetConfirmationState::eConfirmed &&
       aState == TargetConfirmationState::eConfirmed &&
       mTargetApzc && aTargetApzc &&
       mTargetApzc->GetGuid() != aTargetApzc->GetGuid()) {
-    MOZ_DIAGNOSTIC_ASSERT(false, "APZ and main thread confirmed scrollbar drag block with different targets");
+#ifdef NIGHTLY_BUILD
+    MOZ_RELEASE_ASSERT(false, "APZ and main thread confirmed scrollbar drag block with different targets");
+#endif
     UpdateTargetApzc(aTargetApzc);
     return true;
   }
 
   if (mTargetConfirmed != TargetConfirmationState::eUnconfirmed) {
     return false;
   }
   mTargetConfirmed = aState;