From fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 19 Apr 2024 03:14:29 +0200
Subject: Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 gfx/layers/apz/testutil/APZTestData.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gfx/layers/apz/testutil')

diff --git a/gfx/layers/apz/testutil/APZTestData.h b/gfx/layers/apz/testutil/APZTestData.h
index e4a73c80cc..d180bbcf1d 100644
--- a/gfx/layers/apz/testutil/APZTestData.h
+++ b/gfx/layers/apz/testutil/APZTestData.h
@@ -144,10 +144,10 @@ class APZTestData {
 // A helper class for logging data for a paint.
 class APZPaintLogHelper {
  public:
-  APZPaintLogHelper(APZTestData* aTestData, SequenceNumber aPaintSequenceNumber)
+  APZPaintLogHelper(APZTestData* aTestData, SequenceNumber aPaintSequenceNumber,
+                    bool aIsTestLoggingEnabled)
       : mTestData(aTestData), mPaintSequenceNumber(aPaintSequenceNumber) {
-    MOZ_ASSERT(!aTestData || StaticPrefs::apz_test_logging_enabled(),
-               "don't call me");
+    MOZ_ASSERT(!aTestData || aIsTestLoggingEnabled, "don't call me");
   }
 
   template <typename Value>
-- 
cgit v1.2.3