From 4ce21bd73cefa4fff5229a53cd180a67fc6b0076 Mon Sep 17 00:00:00 2001
From: "fred.wang@free.fr"
Date: Thu, 7 Jul 2016 14:09:22 +0000
Subject: [PATCH] Improve test
mathml/presentation/tokenElements-background-color.html
https://bugs.webkit.org/show_bug.cgi?id=130693
We use the Ahem font to make tokenElements-background-color.html more reliable. However, we
remove the case of italic m because Ahem does not contain the required character U+1D45A.
Patch by Frederic Wang on 2016-07-07
Reviewed by Martin Robinson.
* mathml/presentation/tokenElements-background-color-expected.html:
* mathml/presentation/tokenElements-background-color.html:
* platform/ios-simulator-wk1/TestExpectations:
* platform/ios-simulator-wk2/TestExpectations:
* platform/mac/TestExpectations:
* platform/win/TestExpectations:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@202903 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---
LayoutTests/ChangeLog | 17 +++++++++++++++++
.../tokenElements-background-color-expected.html | 4 +++-
.../presentation/tokenElements-background-color.html | 2 +-
LayoutTests/platform/ios-simulator-wk1/TestExpectations | 1 -
LayoutTests/platform/ios-simulator-wk2/TestExpectations | 3 ---
LayoutTests/platform/mac/TestExpectations | 1 -
LayoutTests/platform/win/TestExpectations | 1 -
7 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 57fa724..c0c49e4 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,20 @@
+2016-07-07 Frederic Wang
+
+ Improve test mathml/presentation/tokenElements-background-color.html
+ https://bugs.webkit.org/show_bug.cgi?id=130693
+
+ We use the Ahem font to make tokenElements-background-color.html more reliable. However, we
+ remove the case of italic m because Ahem does not contain the required character U+1D45A.
+
+ Reviewed by Martin Robinson.
+
+ * mathml/presentation/tokenElements-background-color-expected.html:
+ * mathml/presentation/tokenElements-background-color.html:
+ * platform/ios-simulator-wk1/TestExpectations:
+ * platform/ios-simulator-wk2/TestExpectations:
+ * platform/mac/TestExpectations:
+ * platform/win/TestExpectations:
+
2016-07-07 Frederic Wang
Fix the name of mathml-in-dashboard-expected.txt for iOS.
diff --git a/LayoutTests/mathml/presentation/tokenElements-background-color-expected.html b/LayoutTests/mathml/presentation/tokenElements-background-color-expected.html
index 8f86eec..78d8f77 100644
--- a/LayoutTests/mathml/presentation/tokenElements-background-color-expected.html
+++ b/LayoutTests/mathml/presentation/tokenElements-background-color-expected.html
@@ -12,6 +12,9 @@
math > mrow > mrow {
visibility: hidden;
}
+ mo, mtext, mn, mi {
+ font: 20px Ahem;
+ }
@@ -22,7 +25,6 @@
mo
+
mi
- m
mn
diff --git a/LayoutTests/mathml/presentation/tokenElements-background-color.html b/LayoutTests/mathml/presentation/tokenElements-background-color.html
index 742ed82..1120413 100644
--- a/LayoutTests/mathml/presentation/tokenElements-background-color.html
+++ b/LayoutTests/mathml/presentation/tokenElements-background-color.html
@@ -11,6 +11,7 @@
}
mo, mtext, mn, mi {
background: #faa;
+ font: 20px Ahem;
}
@@ -25,7 +26,6 @@
mo
+
mi
- m
mn
diff --git a/LayoutTests/platform/ios-simulator-wk1/TestExpectations b/LayoutTests/platform/ios-simulator-wk1/TestExpectations
index 037787e..8795785 100644
--- a/LayoutTests/platform/ios-simulator-wk1/TestExpectations
+++ b/LayoutTests/platform/ios-simulator-wk1/TestExpectations
@@ -736,7 +736,6 @@ mathml/presentation/mo-invisible.html
# MathML tests that fail:
mathml/presentation/mo-stretch-update.html [ ImageOnlyFailure ]
mathml/presentation/scripts-subsup.html [ ImageOnlyFailure ]
-mathml/presentation/tokenElements-background-color.html [ ImageOnlyFailure ]
# SVG tests that fail:
imported/mozilla/svg/smil/motion/animateMotion-values-linear-1.svg [ ImageOnlyFailure ]
diff --git a/LayoutTests/platform/ios-simulator-wk2/TestExpectations b/LayoutTests/platform/ios-simulator-wk2/TestExpectations
index 79fe3cb..0fac76f 100644
--- a/LayoutTests/platform/ios-simulator-wk2/TestExpectations
+++ b/LayoutTests/platform/ios-simulator-wk2/TestExpectations
@@ -134,9 +134,6 @@ scrollbars/scrolling-by-page-on-keyboard-spacebar.html [ Failure ]
# WebKitTestRunner needs testRunner.setUseDashboardCompatibilityMode
mathml/mathml-in-dashboard.html [ Skip ]
-# MathML tests that fail due to slight pixel differences:
-mathml/presentation/tokenElements-background-color.html [ ImageOnlyFailure ]
-
# SVG tests that time out (these require EventSender)
svg/animations/animVal-basics.html
svg/animations/animate-calcMode-spline-by.html
diff --git a/LayoutTests/platform/mac/TestExpectations b/LayoutTests/platform/mac/TestExpectations
index b48850b2..8a80aff 100644
--- a/LayoutTests/platform/mac/TestExpectations
+++ b/LayoutTests/platform/mac/TestExpectations
@@ -808,7 +808,6 @@ mathml/opentype/large-operators-italic-correction.html [ Skip ]
# MathML tests that fail:
mathml/presentation/multiscripts-positions.html [ Pass ImageOnlyFailure ]
mathml/presentation/scripts-subsup.html [ Pass ImageOnlyFailure ]
-webkit.org/b/130693 mathml/presentation/tokenElements-background-color.html [ ImageOnlyFailure ]
webkit.org/b/128255 compositing/columns/composited-lr-paginated-repaint.html [ Pass Failure ]
webkit.org/b/128255 compositing/columns/composited-rl-paginated-repaint.html [ Pass Failure ]
diff --git a/LayoutTests/platform/win/TestExpectations b/LayoutTests/platform/win/TestExpectations
index d2ed98f..1785d08 100644
--- a/LayoutTests/platform/win/TestExpectations
+++ b/LayoutTests/platform/win/TestExpectations
@@ -1940,7 +1940,6 @@ http/tests/security/webgl-remote-read-remote-image-blocked-no-crossorigin.html [
################## MathML Issues ####################
################################################################################
mathml/presentation/mo-stacked-glyphs.html [ ImageOnlyFailure ]
-mathml/presentation/tokenElements-background-color.html [ ImageOnlyFailure ]
mathml/presentation/style-changed.html [ Crash Pass ]
mathml/opentype/large-operators-munderover.html [ Failure ]
mathml/presentation/attributes-mathvariant.html [ ImageOnlyFailure ]
--
1.8.3.1