From fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:14:29 +0200 Subject: Merging upstream version 125.0.1. Signed-off-by: Daniel Baumann --- .../browser/browser_native_font_cache_macos.js | 10 +++++--- .../browser_windowless_troubleshoot_crash.js | 9 ++++--- gfx/tests/chrome/test_device_reset.html | 2 +- gfx/tests/crashtests/1701975-1.html | 20 --------------- gfx/tests/crashtests/306902-1.xml | 14 ---------- gfx/tests/crashtests/385289-1.xhtml | 30 ---------------------- gfx/tests/crashtests/410728-1.xml | 14 ---------- gfx/tests/crashtests/crashtests.list | 6 +---- gfx/tests/gtest/TestConfigManager.cpp | 6 +++++ gfx/tests/reftest/reftest.list | 8 +++--- 10 files changed, 23 insertions(+), 96 deletions(-) delete mode 100644 gfx/tests/crashtests/1701975-1.html delete mode 100644 gfx/tests/crashtests/306902-1.xml delete mode 100644 gfx/tests/crashtests/385289-1.xhtml delete mode 100644 gfx/tests/crashtests/410728-1.xml (limited to 'gfx/tests') diff --git a/gfx/tests/browser/browser_native_font_cache_macos.js b/gfx/tests/browser/browser_native_font_cache_macos.js index 919a5c7a72..e71ccbf5a6 100644 --- a/gfx/tests/browser/browser_native_font_cache_macos.js +++ b/gfx/tests/browser/browser_native_font_cache_macos.js @@ -87,8 +87,9 @@ add_task(async () => { const nfrm_match = nfrm_line.exec(copiedText); if (nfrm_match) { const nfrm_mb = nfrm_match[1]; - ok( - nfrm_mb < MB_EXCLUSIVE_MAX, + Assert.less( + nfrm_mb, + MB_EXCLUSIVE_MAX, `native-font-resource-mac ${nfrm_mb} MB should be less than ${MB_EXCLUSIVE_MAX} MB.` ); } else { @@ -102,8 +103,9 @@ add_task(async () => { const gfx_match = gfx_line.exec(copiedText); if (gfx_match && gfx_match.index < om_match.index) { const gfx_mb = gfx_match[1]; - ok( - gfx_mb < MB_EXCLUSIVE_MAX, + Assert.less( + gfx_mb, + MB_EXCLUSIVE_MAX, `Explicit Allocations gfx ${gfx_mb} MB should be less than ${MB_EXCLUSIVE_MAX} MB.` ); } else { diff --git a/gfx/tests/browser/browser_windowless_troubleshoot_crash.js b/gfx/tests/browser/browser_windowless_troubleshoot_crash.js index 44fc50e2f8..2ccae78a6e 100644 --- a/gfx/tests/browser/browser_windowless_troubleshoot_crash.js +++ b/gfx/tests/browser/browser_windowless_troubleshoot_crash.js @@ -1,10 +1,10 @@ add_task(async function test_windowlessBrowserTroubleshootCrash() { let webNav = Services.appShell.createWindowlessBrowser(false); - let onLoaded = new Promise((resolve, reject) => { + let onLoaded = new Promise(resolve => { let docShell = webNav.docShell; let listener = { - observe(contentWindow, topic, data) { + observe(contentWindow) { let observedDocShell = contentWindow.docShell.sameTypeRootTreeItem.QueryInterface( Ci.nsIDocShell @@ -45,8 +45,9 @@ add_task(async function test_windowlessBrowserTroubleshootCrash() { ); var data = await Troubleshoot.snapshot(); - ok( - data.graphics.windowLayerManagerType !== "None", + Assert.notStrictEqual( + data.graphics.windowLayerManagerType, + "None", "windowless browser window should not set windowLayerManagerType to 'None'" ); diff --git a/gfx/tests/chrome/test_device_reset.html b/gfx/tests/chrome/test_device_reset.html index a081c26dc4..167dff1b7b 100644 --- a/gfx/tests/chrome/test_device_reset.html +++ b/gfx/tests/chrome/test_device_reset.html @@ -70,7 +70,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1274663 windowutils.triggerDeviceReset(); SimpleTest.waitForExplicitFinish(); - window.addEventListener("MozAfterPaint", function paintHandle(e) { + window.addEventListener("MozAfterPaint", function paintHandle() { // Add more latency before calling runCanvasTest() // runCanvasTest() needs to be called after gecko's device reset handling. // Since Bug 1757879 fix, the triggerDeviceReset() does the device reset diff --git a/gfx/tests/crashtests/1701975-1.html b/gfx/tests/crashtests/1701975-1.html deleted file mode 100644 index c7d54ca996..0000000000 --- a/gfx/tests/crashtests/1701975-1.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - diff --git a/gfx/tests/crashtests/306902-1.xml b/gfx/tests/crashtests/306902-1.xml deleted file mode 100644 index 24e8c068a0..0000000000 --- a/gfx/tests/crashtests/306902-1.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - -XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - - - - - diff --git a/gfx/tests/crashtests/385289-1.xhtml b/gfx/tests/crashtests/385289-1.xhtml deleted file mode 100644 index 666756c016..0000000000 --- a/gfx/tests/crashtests/385289-1.xhtml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - -
- - - v - 1 - - -
- - - - diff --git a/gfx/tests/crashtests/410728-1.xml b/gfx/tests/crashtests/410728-1.xml deleted file mode 100644 index deaeb8fc55..0000000000 --- a/gfx/tests/crashtests/410728-1.xml +++ /dev/null @@ -1,14 +0,0 @@ - - -]> - - f ̲ - - - + - - - ̲ - diff --git a/gfx/tests/crashtests/crashtests.list b/gfx/tests/crashtests/crashtests.list index d3c9efef11..44a2f61050 100644 --- a/gfx/tests/crashtests/crashtests.list +++ b/gfx/tests/crashtests/crashtests.list @@ -5,7 +5,6 @@ load 199379-1.html load 206561-1.html load 248518-1.html load 306649-1.xml -load 306902-1.xml load 333861-1.html load 334735-1.html load 345576-1.html @@ -24,7 +23,6 @@ load 383473-1.html load 383872-1.svg load 385228-1.svg skip load 385228-2.svg # bug 523255 / bug 385228 -load 385289-1.xhtml load 385417-1.html load 385417-2.html load 385423-1.html @@ -32,7 +30,7 @@ load 385423-2.html load 385719-1.html load 389326-1.html load 390476.html -skip-if(xulRuntime.OS=="WINNT"&&!xulRuntime.is64Bit) load 393746-1.xhtml # Bug 1727925 +skip-if(winWidget&&!is64Bit) load 393746-1.xhtml # Bug 1727925 load 393749-1.html load 393822-1.html load 394384-1.html @@ -53,7 +51,6 @@ load 405268-1.xhtml load 407761-1.html load 407842.html load 408754-1.html -load 410728-1.xml load 416637-1.html load 419095-1.html load 419255-1.html @@ -205,7 +202,6 @@ load 1694783-1.html load 1695782-1.html load 1699013.html load 1700232.html -load 1701975-1.html load 1704321-1.html load 1702638.html load 1730695.html diff --git a/gfx/tests/gtest/TestConfigManager.cpp b/gfx/tests/gtest/TestConfigManager.cpp index d76dcfd234..825a995e98 100644 --- a/gfx/tests/gtest/TestConfigManager.cpp +++ b/gfx/tests/gtest/TestConfigManager.cpp @@ -159,6 +159,12 @@ class MockGfxInfo final : public nsIGfxInfo { NS_IMETHOD GetUsingGPUProcess(bool* aOutValue) override { return NS_ERROR_NOT_IMPLEMENTED; } + NS_IMETHOD GetUsingRemoteCanvas(bool* aOutValue) override { + return NS_ERROR_NOT_IMPLEMENTED; + } + NS_IMETHOD GetUsingAcceleratedCanvas(bool* aOutValue) override { + return NS_ERROR_NOT_IMPLEMENTED; + } NS_IMETHOD GetIsHeadless(bool* aIsHeadless) override { return NS_ERROR_NOT_IMPLEMENTED; } diff --git a/gfx/tests/reftest/reftest.list b/gfx/tests/reftest/reftest.list index bb081d5c06..dcdac53c67 100644 --- a/gfx/tests/reftest/reftest.list +++ b/gfx/tests/reftest/reftest.list @@ -2,7 +2,7 @@ == 468496-1.html 468496-1-ref.html fuzzy(0-175,0-443) == 611498-1.html 611498-ref.html skip-if(gtkWidget||Android||isDebugBuild) fuzzy-if(appleSilicon,0-1,0-9) == 709477-1.html 709477-1-ref.html #Bug 1620096 -skip-if(!asyncPan) == 1086723.html 1086723-ref.html +skip-if(useDrawSnapshot) == 1086723.html 1086723-ref.html == 853889-1.html 853889-1-ref.html skip-if(Android) fuzzy(0-1,0-587) == 1143303-1.svg pass.svg fuzzy(0-100,0-30) == 1149923.html 1149923-ref.html # use fuzzy due to few distorted pixels caused by border-radius @@ -18,13 +18,13 @@ fuzzy-if(!useDrawSnapshot,0-5,0-1060) fuzzy-if(useDrawSnapshot,32-32,26350-26350 fuzzy(0-11,0-4) fails-if(useDrawSnapshot) == 1474722.html 1474722-ref.html fails-if(useDrawSnapshot) == 1501195.html 1501195-ref.html == 1519754.html 1519754-ref.html -skip-if(!asyncPan) == 1524261.html 1524261-ref.html +skip-if(useDrawSnapshot) == 1524261.html 1524261-ref.html fuzzy-if(!useDrawSnapshot,14-14,44-95) == 1524353.html 1524353-ref.html == 1523776.html 1523776-ref.html == bug1523410-translate-scale-snap.html bug1523410-translate-scale-snap-ref.html == 1523080.html 1523080-ref.html == 1616444-same-color-different-paths.html 1616444-same-color-different-paths-ref.html -skip-if(!asyncPan||Android) fuzzy-if(winWidget,54-94,2713-3419) fuzzy-if(cocoaWidget,24-24,1190-1200) pref(apz.allow_zooming,true) == picture-caching-on-async-zoom.html picture-caching-on-async-zoom.html?ref +skip-if(useDrawSnapshot||Android) fuzzy-if(winWidget,54-94,2713-3419) fuzzy-if(cocoaWidget,24-24,1190-1200) pref(apz.allow_zooming,true) == picture-caching-on-async-zoom.html picture-caching-on-async-zoom.html?ref pref(apz.allow_zooming,true) fails-if(useDrawSnapshot) == 1662062-1-no-blurry.html 1662062-1-ref.html # Bug 1715676: nsBulletFrame has been removed and the new rendering does not use PushRoundedRect that this test is for: # == 1681610.html 1681610-ref.html @@ -32,7 +32,7 @@ skip-if(geckoview) fuzzy-if(!useDrawSnapshot,0-255,0-1050) fuzzy-if(useDrawSnaps fuzzy(64-99,506-645) == 1696439-1.html 1696439-1-ref.html random-if(gtkWidget) == 1722689-1.html 1722689-1-ref.html fuzzy-if(useDrawSnapshot,255-255,5-5) == 1724901-1.html 1724901-1-ref.html -pref(image.downscale-during-decode.enabled,true) skip-if(Android) fuzzy-if(useDrawSnapshot&&browserIsFission,203-203,193600-193600) HTTP == 1724901-2.html 1724901-2-ref.html +pref(image.downscale-during-decode.enabled,true) skip-if(Android) fuzzy-if(useDrawSnapshot&&fission,203-203,193600-193600) HTTP == 1724901-2.html 1724901-2-ref.html == 1760747-1.html 1760747-1-ref.html != 1761685-1.html 1761685-1-ref.html fuzzy(0-9,0-305) == 1761460.html 1761460-ref.html -- cgit v1.2.3