Diff
Modified: trunk/LayoutTests/ChangeLog (185118 => 185119)
--- trunk/LayoutTests/ChangeLog 2015-06-02 20:20:41 UTC (rev 185118)
+++ trunk/LayoutTests/ChangeLog 2015-06-02 20:22:15 UTC (rev 185119)
@@ -1,3 +1,23 @@
+2015-06-02 Said Abou-Hallawa <sabouhall...@apple.com>
+
+ Fix Mac Mavericks layout test failure following <http://trac.webkit.org/changeset/185096>
+ (https://bugs.webkit.org/show_bug.cgi?id=145478)
+
+ Move fast/text/font-weights-zh.html out of the platform directory. The
+ webkit test runner is not smart enough to ignore the expected results
+ in the mac directory and get it from the Mavericks directory, if it exists,
+ when running on Mavericks.
+
+ Reviewed by Alexey Proskuryakov.
+
+ * fast/text/font-weights-zh.html: Added.
+ * platform/efl/TestExpectations:
+ * platform/gtk/TestExpectations:
+ * platform/mac/fast/text/font-weights-zh.html: Removed.
+ * platform/win/TestExpectations:
+ * platform/win-xp/TestExpectations:
+ * platform/wincairo/TestExpectations:
+
2015-06-02 Brady Eidson <beid...@apple.com>
Add more tests for "should open external urls" flag.
Added: trunk/LayoutTests/fast/text/font-weights-zh.html (0 => 185119)
--- trunk/LayoutTests/fast/text/font-weights-zh.html (rev 0)
+++ trunk/LayoutTests/fast/text/font-weights-zh.html 2015-06-02 20:22:15 UTC (rev 185119)
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+</head>
+<body>
+This test is designed to test the interaction between font-family and font-weight. In particular, our implementation of font-family accepts PostScript names, which may name a font with a particular weight. However, there is another CSS property, font-weight, in which the author may also name a particular weight. Our font selection algorithm takes both of these signals into account when choosing fonts.<br><br>There is currently no good way in _javascript_ to find the actual font chosen for some text. Therefore, the best way to test this aspect of the font selection algorithm is to dump the render tree, therefore testing glyph advances (which are a property of font weight).
+<script>
+function generateElements(fontNames) {
+ ["normal", "italic"].forEach(function(fontStyle) {
+ fontNames.forEach(function(fontName) {
+ for (var fontWeight = 100; fontWeight < 1000; fontWeight += 100) {
+ var d = document.createElement("div");
+ d.innerText = "Font: " + fontName + " Weight: " + fontWeight + " Style: " + fontStyle;
+ document.body.appendChild(d);
+ d = document.createElement("div");
+ d.style.fontFamily = fontName;
+ d.style.fontWeight = fontWeight;
+ d.style.fontStyle = fontStyle;
+ d.innerText = "果城的美譽。中国古";
+ document.body.appendChild(d);
+ }
+ });
+ });
+}
+var heitiFonts = ["Heiti SC", "STHeitiSC-Light", "STHeitiSC-Medium"];
+var songtiFonts = ["Songti SC", "STSongti-SC-Regular", "STSongti-SC-Light", "STSongti-SC-Bold", "STSongti-SC-Black"];
+var hiraginoFonts = ["Hiragino Kaku Gothic ProN", "HiraKakuProN-W3", "HiraKakuProN-W6"];
+var appleSDGothicNeoFonts = ["Apple SD Gothic Neo", "AppleSDGothicNeo-Regular", "AppleSDGothicNeo-Medium", "AppleSDGothicNeo-Light", "AppleSDGothicNeo-UltraLight", "AppleSDGothicNeo-Thin", "AppleSDGothicNeo-SemiBold", "AppleSDGothicNeo-Bold", "AppleSDGothicNeo-ExtraBold", "AppleSDGothicNeo-Heavy"];
+generateElements(heitiFonts);
+generateElements(songtiFonts);
+generateElements(hiraginoFonts);
+generateElements(appleSDGothicNeoFonts);
+</script>
+</body>
+</html>
Modified: trunk/LayoutTests/platform/efl/TestExpectations (185118 => 185119)
--- trunk/LayoutTests/platform/efl/TestExpectations 2015-06-02 20:20:41 UTC (rev 185118)
+++ trunk/LayoutTests/platform/efl/TestExpectations 2015-06-02 20:22:15 UTC (rev 185119)
@@ -282,6 +282,9 @@
# TESTS EXPECTED TO FAIL
#////////////////////////////////////////////////////////////////////////////////////////
+# These tests reference specific fonts on Mac port.
+Bug(EFL) fast/text/font-weights-zh.html [ WontFix ]
+
# These tests require DASHBOARD_SUPPORT but this feature is specific to Mac port.
Bug(EFL) fast/canvas/canvas-gradient-addStop-error.html
Bug(EFL) http/tests/xmlhttprequest/default-content-type-dashboard.html
Modified: trunk/LayoutTests/platform/gtk/TestExpectations (185118 => 185119)
--- trunk/LayoutTests/platform/gtk/TestExpectations 2015-06-02 20:20:41 UTC (rev 185118)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2015-06-02 20:22:15 UTC (rev 185119)
@@ -290,6 +290,9 @@
webkit.org/b/71849 webkit.org/b/111477 inspector-protocol/layers [ Skip ]
webkit.org/b/71849 webgl [ Skip ]
+# These tests reference specific fonts on Mac port.
+Bug(GTK) fast/text/font-weights-zh.html [ WontFix ]
+
# LAYER_TREE_INCLUDES_VISIBLE_RECTS option to layerTreeAsText is only applicable to Mac.
Bug(GTK) compositing/visible-rect [ Skip ]
Deleted: trunk/LayoutTests/platform/mac/fast/text/font-weights-zh.html (185118 => 185119)
--- trunk/LayoutTests/platform/mac/fast/text/font-weights-zh.html 2015-06-02 20:20:41 UTC (rev 185118)
+++ trunk/LayoutTests/platform/mac/fast/text/font-weights-zh.html 2015-06-02 20:22:15 UTC (rev 185119)
@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8">
-</head>
-<body>
-This test is designed to test the interaction between font-family and font-weight. In particular, our implementation of font-family accepts PostScript names, which may name a font with a particular weight. However, there is another CSS property, font-weight, in which the author may also name a particular weight. Our font selection algorithm takes both of these signals into account when choosing fonts.<br><br>There is currently no good way in _javascript_ to find the actual font chosen for some text. Therefore, the best way to test this aspect of the font selection algorithm is to dump the render tree, therefore testing glyph advances (which are a property of font weight).
-<script>
-function generateElements(fontNames) {
- ["normal", "italic"].forEach(function(fontStyle) {
- fontNames.forEach(function(fontName) {
- for (var fontWeight = 100; fontWeight < 1000; fontWeight += 100) {
- var d = document.createElement("div");
- d.innerText = "Font: " + fontName + " Weight: " + fontWeight + " Style: " + fontStyle;
- document.body.appendChild(d);
- d = document.createElement("div");
- d.style.fontFamily = fontName;
- d.style.fontWeight = fontWeight;
- d.style.fontStyle = fontStyle;
- d.innerText = "果城的美譽。中国古";
- document.body.appendChild(d);
- }
- });
- });
-}
-var heitiFonts = ["Heiti SC", "STHeitiSC-Light", "STHeitiSC-Medium"];
-var songtiFonts = ["Songti SC", "STSongti-SC-Regular", "STSongti-SC-Light", "STSongti-SC-Bold", "STSongti-SC-Black"];
-var hiraginoFonts = ["Hiragino Kaku Gothic ProN", "HiraKakuProN-W3", "HiraKakuProN-W6"];
-var appleSDGothicNeoFonts = ["Apple SD Gothic Neo", "AppleSDGothicNeo-Regular", "AppleSDGothicNeo-Medium", "AppleSDGothicNeo-Light", "AppleSDGothicNeo-UltraLight", "AppleSDGothicNeo-Thin", "AppleSDGothicNeo-SemiBold", "AppleSDGothicNeo-Bold", "AppleSDGothicNeo-ExtraBold", "AppleSDGothicNeo-Heavy"];
-generateElements(heitiFonts);
-generateElements(songtiFonts);
-generateElements(hiraginoFonts);
-generateElements(appleSDGothicNeoFonts);
-</script>
-</body>
-</html>
Modified: trunk/LayoutTests/platform/win/TestExpectations (185118 => 185119)
--- trunk/LayoutTests/platform/win/TestExpectations 2015-06-02 20:20:41 UTC (rev 185118)
+++ trunk/LayoutTests/platform/win/TestExpectations 2015-06-02 20:22:15 UTC (rev 185119)
@@ -512,6 +512,9 @@
# TODO Fail until SUBPIXEL_LAYOUT is enabled
webkit.org/b/85532 fast/sub-pixel [ Skip ]
+# These tests reference specific fonts on Mac port.
+fast/text/font-weights-zh.html [ WontFix ]
+
# TODO LAYER_TREE_INCLUDES_VISIBLE_RECTS option to layerTreeAsText is only applicable to Mac.
compositing/visible-rect/ [ Skip ]
Modified: trunk/LayoutTests/platform/wincairo/TestExpectations (185118 => 185119)
--- trunk/LayoutTests/platform/wincairo/TestExpectations 2015-06-02 20:20:41 UTC (rev 185118)
+++ trunk/LayoutTests/platform/wincairo/TestExpectations 2015-06-02 20:22:15 UTC (rev 185119)
@@ -610,6 +610,9 @@
# Times out https://bugs.webkit.org/show_bug.cgi?id=51787
media/video-element-other-namespace-crash.html
+# These tests reference specific fonts on Mac port.
+fast/text/font-weights-zh.html [ WontFix ]
+
# <rdar://problem/5075790> Layout tests that depend on certain fonts don't match Mac results:
# - Mac OS X and Windows do not have an Arabic font in common
fast/text/international/bidi-AN-after-L.html
