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>
---
 layout/reftests/text/reftest.list                | 4 ++--
 layout/reftests/text/webkit-text-security-1.html | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'layout/reftests/text')

diff --git a/layout/reftests/text/reftest.list b/layout/reftests/text/reftest.list
index 983d66946e..1402cc7ad7 100644
--- a/layout/reftests/text/reftest.list
+++ b/layout/reftests/text/reftest.list
@@ -58,7 +58,7 @@ skip == subpixel-glyphs-x-1a.html subpixel-glyphs-x-1b.html
 # inconsistencies.  On those platforms we just test that glyph positions are
 # subpixel.
 # D2D/DirectWrite results depend on the rendering mode chosen, so considering this as random for now.
-skip-if(!(d2d||cocoaWidget)) random-if(d2d) != subpixel-glyphs-x-2a.html subpixel-glyphs-x-2b.html
+skip-if(!(winWidget||cocoaWidget)) random-if(winWidget) != subpixel-glyphs-x-2a.html subpixel-glyphs-x-2b.html
 == subpixel-glyphs-x-3a.html subpixel-glyphs-x-3b.html
 # No platforms do subpixel positioning vertically
 fuzzy-if(Android,0-19,0-2) == subpixel-glyphs-y-1a.html subpixel-glyphs-y-1b.html
@@ -77,7 +77,7 @@ pref(intl.icu4x.segmenter.enabled,false) == wordbreak-1.html wordbreak-1-ref.htm
 == wordbreak-3.html wordbreak-3-ref.html
 == wordbreak-4b.html wordbreak-4b-ref.html
 == wordbreak-5.html wordbreak-5-ref.html
-fails-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu)) == wordbreak-6.html wordbreak-6-ref.html # Bug 1258239
+fails-if(winWidget) == wordbreak-6.html wordbreak-6-ref.html # Bug 1258239
 == wordbreak-7a.html wordbreak-7a-ref.html
 fails == wordbreak-7b.html wordbreak-7b-ref.html # bug 479829
 == wordbreak-8.html wordbreak-8-ref.html
diff --git a/layout/reftests/text/webkit-text-security-1.html b/layout/reftests/text/webkit-text-security-1.html
index 19ffaf5b49..95cdeff992 100644
--- a/layout/reftests/text/webkit-text-security-1.html
+++ b/layout/reftests/text/webkit-text-security-1.html
@@ -130,7 +130,7 @@ input type="email": <input class="test" type="email" value="a@example.org"><br>
 <!--input type="week": <input class="test" type="week" value="12:00:00"><br>-->
 <!--input type="file": <input class="test" type="file"><br>-->
 <!--input type="image": <input class="test" type="image"><br>-->
-select: <select class="test"><option>A</option><option>BB</option></select><br>
+select: <select style="appearance: none" class="test"><option>A</option><option>BB</option></select><br>
 SVG: <svg height="30px" class="test"><text y="20">SVG Text</text></svg><br>
 
 Ordered list, first item empty: <ol class="test"><li></li><li>a</li><li>bb</li></ol>
-- 
cgit v1.2.3