<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[185119] trunk/LayoutTests</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/185119">185119</a></dd>
<dt>Author</dt> <dd>said@apple.com</dd>
<dt>Date</dt> <dd>2015-06-02 13:22:15 -0700 (Tue, 02 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformeflTestExpectations">trunk/LayoutTests/platform/efl/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformgtkTestExpectations">trunk/LayoutTests/platform/gtk/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformwinTestExpectations">trunk/LayoutTests/platform/win/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformwincairoTestExpectations">trunk/LayoutTests/platform/wincairo/TestExpectations</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextfontweightszhhtml">trunk/LayoutTests/fast/text/font-weights-zh.html</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformmacfasttextfontweightszhhtml">trunk/LayoutTests/platform/mac/fast/text/font-weights-zh.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (185118 => 185119)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-06-02 20:20:41 UTC (rev 185118)
+++ trunk/LayoutTests/ChangeLog 2015-06-02 20:22:15 UTC (rev 185119)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-06-02 Said Abou-Hallawa <sabouhallawa@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:
+
</ins><span class="cx"> 2015-06-02 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Add more tests for "should open external urls" flag.
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextfontweightszhhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/font-weights-zh.html (0 => 185119)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+<!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>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformeflTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/efl/TestExpectations (185118 => 185119)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -282,6 +282,9 @@
</span><span class="cx"> # TESTS EXPECTED TO FAIL
</span><span class="cx"> #////////////////////////////////////////////////////////////////////////////////////////
</span><span class="cx">
</span><ins>+# These tests reference specific fonts on Mac port.
+Bug(EFL) fast/text/font-weights-zh.html [ WontFix ]
+
</ins><span class="cx"> # These tests require DASHBOARD_SUPPORT but this feature is specific to Mac port.
</span><span class="cx"> Bug(EFL) fast/canvas/canvas-gradient-addStop-error.html
</span><span class="cx"> Bug(EFL) http/tests/xmlhttprequest/default-content-type-dashboard.html
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/TestExpectations (185118 => 185119)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -290,6 +290,9 @@
</span><span class="cx"> webkit.org/b/71849 webkit.org/b/111477 inspector-protocol/layers [ Skip ]
</span><span class="cx"> webkit.org/b/71849 webgl [ Skip ]
</span><span class="cx">
</span><ins>+# These tests reference specific fonts on Mac port.
+Bug(GTK) fast/text/font-weights-zh.html [ WontFix ]
+
</ins><span class="cx"> # LAYER_TREE_INCLUDES_VISIBLE_RECTS option to layerTreeAsText is only applicable to Mac.
</span><span class="cx"> Bug(GTK) compositing/visible-rect [ Skip ]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfasttextfontweightszhhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac/fast/text/font-weights-zh.html (185118 => 185119)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,36 +0,0 @@
</span><del>-<!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>
</del></span></pre></div>
<a id="trunkLayoutTestsplatformwinTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/win/TestExpectations (185118 => 185119)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -512,6 +512,9 @@
</span><span class="cx"> # TODO Fail until SUBPIXEL_LAYOUT is enabled
</span><span class="cx"> webkit.org/b/85532 fast/sub-pixel [ Skip ]
</span><span class="cx">
</span><ins>+# These tests reference specific fonts on Mac port.
+fast/text/font-weights-zh.html [ WontFix ]
+
</ins><span class="cx"> # TODO LAYER_TREE_INCLUDES_VISIBLE_RECTS option to layerTreeAsText is only applicable to Mac.
</span><span class="cx"> compositing/visible-rect/ [ Skip ]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwincairoTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/wincairo/TestExpectations (185118 => 185119)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -610,6 +610,9 @@
</span><span class="cx"> # Times out https://bugs.webkit.org/show_bug.cgi?id=51787
</span><span class="cx"> media/video-element-other-namespace-crash.html
</span><span class="cx">
</span><ins>+# These tests reference specific fonts on Mac port.
+fast/text/font-weights-zh.html [ WontFix ]
+
</ins><span class="cx"> # <rdar://problem/5075790> Layout tests that depend on certain fonts don't match Mac results:
</span><span class="cx"> # - Mac OS X and Windows do not have an Arabic font in common
</span><span class="cx"> fast/text/international/bidi-AN-after-L.html
</span></span></pre>
</div>
</div>
</body>
</html>