From 086c044dc34dfc0f74fbe41f4ecb402b2cd34884 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:13:33 +0200 Subject: Merging upstream version 125.0.1. Signed-off-by: Daniel Baumann --- browser/base/content/test/performance/browser_appmenu.js | 9 --------- .../test/performance/browser_startup_content_mainthreadio.js | 7 +++++++ 2 files changed, 7 insertions(+), 9 deletions(-) (limited to 'browser/base/content/test/performance') diff --git a/browser/base/content/test/performance/browser_appmenu.js b/browser/base/content/test/performance/browser_appmenu.js index 37e7482c51..984d2b9fd8 100644 --- a/browser/base/content/test/performance/browser_appmenu.js +++ b/browser/base/content/test/performance/browser_appmenu.js @@ -21,15 +21,6 @@ const EXPECTED_APPMENU_OPEN_REFLOWS = [ "openPopup/this._openPopupPromise<@resource:///modules/PanelMultiView.sys.mjs", ], }, - - { - stack: [ - "_calculateMaxHeight@resource:///modules/PanelMultiView.sys.mjs", - "handleEvent@resource:///modules/PanelMultiView.sys.mjs", - ], - - maxCount: 7, // This number should only ever go down - never up. - }, ]; add_task(async function () { diff --git a/browser/base/content/test/performance/browser_startup_content_mainthreadio.js b/browser/base/content/test/performance/browser_startup_content_mainthreadio.js index e60b95bb3c..e267363064 100644 --- a/browser/base/content/test/performance/browser_startup_content_mainthreadio.js +++ b/browser/base/content/test/performance/browser_startup_content_mainthreadio.js @@ -152,6 +152,13 @@ const processes = { condition: WIN, stat: 1, }, + { + // We should remove this in bug 1882427 + path: "*screenshots@mozilla.org.xpi", + condition: true, + ignoreIfUnused: true, + close: 1, + }, ], }; -- cgit v1.2.3