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 --- layout/reftests/bidi/dirAuto/1103348-1-ref.html | 19 ------------- layout/reftests/bidi/dirAuto/1103348-1.html | 36 ------------------------- layout/reftests/bidi/dirAuto/reftest.list | 1 - layout/reftests/bidi/numeral/reftest.list | 6 ++--- layout/reftests/bidi/reftest.list | 6 ++--- 5 files changed, 6 insertions(+), 62 deletions(-) delete mode 100644 layout/reftests/bidi/dirAuto/1103348-1-ref.html delete mode 100644 layout/reftests/bidi/dirAuto/1103348-1.html (limited to 'layout/reftests/bidi') diff --git a/layout/reftests/bidi/dirAuto/1103348-1-ref.html b/layout/reftests/bidi/dirAuto/1103348-1-ref.html deleted file mode 100644 index 50fba8c41d..0000000000 --- a/layout/reftests/bidi/dirAuto/1103348-1-ref.html +++ /dev/null @@ -1,19 +0,0 @@ - - - - - Dynamic changes and dir=auto - - -
Test for elements with dir="auto" whose content changes between directional and neutral
-
xyz
-
ابج
-
456
-
xyz
-
ابج
-
456
-
xyz
-
ابج
-
456
- - diff --git a/layout/reftests/bidi/dirAuto/1103348-1.html b/layout/reftests/bidi/dirAuto/1103348-1.html deleted file mode 100644 index 4092f27f87..0000000000 --- a/layout/reftests/bidi/dirAuto/1103348-1.html +++ /dev/null @@ -1,36 +0,0 @@ - - - - - Dynamic changes and dir=auto - - -
Test for elements with dir="auto" whose content changes between directional and neutral
-
abc
-
abc
-
abc
-
אבג
-
אבג
-
אבג
-
123
-
123
-
123
- - - diff --git a/layout/reftests/bidi/dirAuto/reftest.list b/layout/reftests/bidi/dirAuto/reftest.list index 14ce0aa670..f47c635124 100644 --- a/layout/reftests/bidi/dirAuto/reftest.list +++ b/layout/reftests/bidi/dirAuto/reftest.list @@ -112,7 +112,6 @@ fuzzy-if(Android,0-3,0-2) == dynamicDirAuto-DeleteText-LTR3.html dynamicDirAuto- == 839886-1.html 839886-1-ref.html == 859093-1.html 859093-1-ref.html == 889742-1.html 889742-1-ref.html -== 1103348-1.html 1103348-1-ref.html == 1169267-delete-add-1a.html 1169267-delete-add-1-ref.html == 1169267-delete-add-1b.html 1169267-delete-add-1-ref.html == 1169267-delete-add-2a.html 1169267-delete-add-2-ref.html diff --git a/layout/reftests/bidi/numeral/reftest.list b/layout/reftests/bidi/numeral/reftest.list index c32d92c866..5e0b101eba 100644 --- a/layout/reftests/bidi/numeral/reftest.list +++ b/layout/reftests/bidi/numeral/reftest.list @@ -34,9 +34,9 @@ pref(bidi.numeral,2) == bug441782-2.html bug441782-2-ref.html pref(bidi.numeral,3) == bug441782-2.html bug441782-2-ref.html pref(bidi.numeral,4) == bug441782-2.html bug441782-2-ref.html pref(bidi.numeral,0) != bug441782-3.html bug441782-3-ref.html -fuzzy-if(winWidget&&!d2d&&d3d11,0-13,0-1) pref(bidi.numeral,1) == bug441782-3.html bug441782-3-ref.html -fuzzy-if(winWidget&&!d2d&&d3d11,0-13,0-1) pref(bidi.numeral,2) == bug441782-3.html bug441782-3-ref.html -fuzzy-if(winWidget&&!d2d&&d3d11,0-13,0-1) pref(bidi.numeral,3) == bug441782-3.html bug441782-3-ref.html +pref(bidi.numeral,1) == bug441782-3.html bug441782-3-ref.html +pref(bidi.numeral,2) == bug441782-3.html bug441782-3-ref.html +pref(bidi.numeral,3) == bug441782-3.html bug441782-3-ref.html pref(bidi.numeral,4) == bug441782-3.html bug441782-3-ref.html pref(bidi.numeral,0) != bug441782-4.html bug441782-4-ref.html pref(bidi.numeral,1) == bug441782-4.html bug441782-4-ref.html diff --git a/layout/reftests/bidi/reftest.list b/layout/reftests/bidi/reftest.list index 4916028c89..c9e77cd88a 100644 --- a/layout/reftests/bidi/reftest.list +++ b/layout/reftests/bidi/reftest.list @@ -18,8 +18,8 @@ fuzzy-if(Android,0-253,0-77) == bidiSVG-03.svg bidiSVG-03-ref.svg fuzzy(0-1,0-1) fuzzy-if(winWidget,0-1,0-2) == bidiSVG-04.svg bidiSVG-04-ref.svg == bidiSVG-05.svg bidiSVG-05-ref.svg == bidiMirroring.svg bidiMirroring-ref.svg # Bug 1392106 -fuzzy-if(Android,0-9,0-134) random-if(layersGPUAccelerated) == visualmarquee.html marquee-ref.html -fuzzy-if(Android,0-9,0-134) random-if(layersGPUAccelerated) == logicalmarquee.html marquee-ref.html +fuzzy-if(Android,0-9,0-134) random == visualmarquee.html marquee-ref.html +fuzzy-if(Android,0-9,0-134) random == logicalmarquee.html marquee-ref.html == visualmarquee.html logicalmarquee.html # test for glyph mirroring in right-to-left text == mirroring-01.html mirroring-01-ref.html @@ -144,7 +144,7 @@ fuzzy(0-1,0-3) == 698291-1.html 698291-1-ref.html == 847242-1.html 847242-1-ref.html # Skip on Android because this is a test and we don't have the requisite XUL on Android. -skip-if(Android) fuzzy(0-92,0-350) fuzzy-if(xulRuntime.widgetToolkit=="gtk",0-1,0-11) == chrome://reftest/content/bidi/869833-1.xhtml chrome://reftest/content/bidi/869833-1-ref.xhtml +skip-if(Android) fuzzy(0-92,0-350) fuzzy-if(gtkWidget,0-1,0-11) == chrome://reftest/content/bidi/869833-1.xhtml chrome://reftest/content/bidi/869833-1-ref.xhtml == 922530-1.html 922530-1-ref.html == 922550-1.html 922550-1-ref.html # Bug 1392106 -- cgit v1.2.3