Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 11 insertions, 9 deletions

diff --git a/dom/animation/DocumentTimeline.cpp b/dom/animation/DocumentTimeline.cpp
index 85e08ca8b0..804ae66160 100644
--- a/dom/animation/DocumentTimeline.cpp
+++ b/dom/animation/DocumentTimeline.cpp
@@ -55,9 +55,9 @@ DocumentTimeline::DocumentTimeline(Document* aDocument,
 }
 
 DocumentTimeline::~DocumentTimeline() {
-  MOZ_ASSERT(!mIsObservingRefreshDriver,
-             "Timeline should have disassociated"
-             " from the refresh driver before being destroyed");
+  MOZ_RELEASE_ASSERT(!mIsObservingRefreshDriver,
+                     "Timeline should have disassociated"
+                     " from the refresh driver before being destroyed");
   if (isInList()) {
     remove();
   }
@@ -206,7 +206,8 @@ void DocumentTimeline::NotifyTimerAdjusted(TimeStamp aTime) {
 }
 
 void DocumentTimeline::ObserveRefreshDriver(nsRefreshDriver* aDriver) {
-  MOZ_ASSERT(!mIsObservingRefreshDriver);
+  MOZ_RELEASE_ASSERT(!mIsObservingRefreshDriver,
+                     "shouldn't register as an observer more than once");
   // Set the mIsObservingRefreshDriver flag before calling AddRefreshObserver
   // since it might end up calling NotifyTimerAdjusted which calls
   // MostRecentRefreshTimeUpdated which has an assertion for
@@ -218,9 +219,10 @@ void DocumentTimeline::ObserveRefreshDriver(nsRefreshDriver* aDriver) {
 }
 
 void DocumentTimeline::NotifyRefreshDriverCreated(nsRefreshDriver* aDriver) {
-  MOZ_ASSERT(!mIsObservingRefreshDriver,
-             "Timeline should not be observing the refresh driver before"
-             " it is created");
+  MOZ_RELEASE_ASSERT(
+      !mIsObservingRefreshDriver,
+      "Timeline should not be observing the refresh driver before"
+      " it is created");
 
   if (!mAnimationOrder.isEmpty()) {
     MOZ_ASSERT(isInList(),
diff --git a/dom/animation/EffectCompositor.h b/dom/animation/EffectCompositor.h
index 34c2688486..78ec63f595 100644
--- a/dom/animation/EffectCompositor.h
+++ b/dom/animation/EffectCompositor.h
@@ -244,8 +244,8 @@ class EffectCompositor {
   // animations that can be throttled, we will add an entry to the hashtable to
   // indicate that the style rule on the element is out of date but without
   // posting a restyle to update it.
-  EnumeratedArray<CascadeLevel, CascadeLevel(kCascadeLevelCount),
-                  nsTHashMap<PseudoElementHashEntry, bool>>
+  EnumeratedArray<CascadeLevel, nsTHashMap<PseudoElementHashEntry, bool>,
+                  kCascadeLevelCount>
       mElementsToRestyle;
 
   bool mIsInPreTraverse = false;