<!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>[185253] 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/185253">185253</a></dd>
<dt>Author</dt> <dd>said@apple.com</dd>
<dt>Date</dt> <dd>2015-06-05 10:41:55 -0700 (Fri, 05 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Rebaseline expected results for svg font tests
Reviewed by Daniel Bates.
* platform/ios-simulator/svg/custom/svg-fonts-no-latin-glyph-expected.txt: Added.
* platform/ios-simulator/svg/custom/svg-fonts-segmented-expected.txt:
* platform/ios-simulator/svg/custom/svg-fonts-with-no-element-reference-expected.txt: Added.
* platform/ios-simulator/svg/text/text-overflow-ellipsis-svgfont-expected.txt:
* platform/ios-simulator/svg/text/text-overflow-ellipsis-svgfont-kerning-ligatures-expected.txt:
* svg/custom/svg-fonts-no-latin-glyph-expected.txt:
* svg/custom/svg-fonts-no-latin-glyph.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorsvgcustomsvgfontssegmentedexpectedtxt">trunk/LayoutTests/platform/ios-simulator/svg/custom/svg-fonts-segmented-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorsvgtexttextoverflowellipsissvgfontexpectedtxt">trunk/LayoutTests/platform/ios-simulator/svg/text/text-overflow-ellipsis-svgfont-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorsvgtexttextoverflowellipsissvgfontkerningligaturesexpectedtxt">trunk/LayoutTests/platform/ios-simulator/svg/text/text-overflow-ellipsis-svgfont-kerning-ligatures-expected.txt</a></li>
<li><a href="#trunkLayoutTestssvgcustomsvgfontsnolatinglyphexpectedtxt">trunk/LayoutTests/svg/custom/svg-fonts-no-latin-glyph-expected.txt</a></li>
<li><a href="#trunkLayoutTestssvgcustomsvgfontsnolatinglyphhtml">trunk/LayoutTests/svg/custom/svg-fonts-no-latin-glyph.html</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformiossimulatorsvgcustomsvgfontsnolatinglyphexpectedtxt">trunk/LayoutTests/platform/ios-simulator/svg/custom/svg-fonts-no-latin-glyph-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorsvgcustomsvgfontswithnoelementreferenceexpectedtxt">trunk/LayoutTests/platform/ios-simulator/svg/custom/svg-fonts-with-no-element-reference-expected.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (185252 => 185253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-06-05 17:19:47 UTC (rev 185252)
+++ trunk/LayoutTests/ChangeLog 2015-06-05 17:41:55 UTC (rev 185253)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-06-05 Said Abou-Hallawa <sabouhallawa@apple.com>
+
+ [iOS] Rebaseline expected results for svg font tests
+
+ Reviewed by Daniel Bates.
+
+ * platform/ios-simulator/svg/custom/svg-fonts-no-latin-glyph-expected.txt: Added.
+ * platform/ios-simulator/svg/custom/svg-fonts-segmented-expected.txt:
+ * platform/ios-simulator/svg/custom/svg-fonts-with-no-element-reference-expected.txt: Added.
+ * platform/ios-simulator/svg/text/text-overflow-ellipsis-svgfont-expected.txt:
+ * platform/ios-simulator/svg/text/text-overflow-ellipsis-svgfont-kerning-ligatures-expected.txt:
+ * svg/custom/svg-fonts-no-latin-glyph-expected.txt:
+ * svg/custom/svg-fonts-no-latin-glyph.html:
+
</ins><span class="cx"> 2015-06-05 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Mask layer now is part of the layer tree output.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorsvgcustomsvgfontsnolatinglyphexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/ios-simulator/svg/custom/svg-fonts-no-latin-glyph-expected.txt (0 => 185253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/svg/custom/svg-fonts-no-latin-glyph-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/ios-simulator/svg/custom/svg-fonts-no-latin-glyph-expected.txt 2015-06-05 17:41:55 UTC (rev 185253)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+Following character should be rendered as an exlamation.
+
+あ
+character height is 17
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorsvgcustomsvgfontssegmentedexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/svg/custom/svg-fonts-segmented-expected.txt (185252 => 185253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/svg/custom/svg-fonts-segmented-expected.txt 2015-06-05 17:19:47 UTC (rev 185252)
+++ trunk/LayoutTests/platform/ios-simulator/svg/custom/svg-fonts-segmented-expected.txt 2015-06-05 17:41:55 UTC (rev 185253)
</span><span class="lines">@@ -4,5 +4,5 @@
</span><span class="cx"> RenderBlock {html} at (0,0) size 800x137
</span><span class="cx"> RenderBody {body} at (8,40) size 784x57
</span><span class="cx"> RenderBlock {p} at (0,0) size 784x57
</span><del>- RenderText {#text} at (0,2) size 256x52
</del><ins>+ RenderText {#text} at (0,2) size 256x53
</ins><span class="cx"> text run at (0,2) width 256: "ABCdefoooO"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorsvgcustomsvgfontswithnoelementreferenceexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/ios-simulator/svg/custom/svg-fonts-with-no-element-reference-expected.txt (0 => 185253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/svg/custom/svg-fonts-with-no-element-reference-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/ios-simulator/svg/custom/svg-fonts-with-no-element-reference-expected.txt 2015-06-05 17:41:55 UTC (rev 185253)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x101
+ RenderBlock {HTML} at (0,0) size 800x101
+ RenderBody {BODY} at (8,18) size 784x64
+ RenderBlock {P} at (0,0) size 784x22
+ RenderText {#text} at (0,1) size 277x20
+ text run at (0,1) width 277: "This text should be rendered with a first font."
+ RenderBlock {P} at (0,40) size 784x23
+ RenderText {#text} at (0,1) size 285x20
+ text run at (0,1) width 285: "This text should be rendered with a second font."
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorsvgtexttextoverflowellipsissvgfontexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/svg/text/text-overflow-ellipsis-svgfont-expected.txt (185252 => 185253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/svg/text/text-overflow-ellipsis-svgfont-expected.txt 2015-06-05 17:19:47 UTC (rev 185252)
+++ trunk/LayoutTests/platform/ios-simulator/svg/text/text-overflow-ellipsis-svgfont-expected.txt 2015-06-05 17:41:55 UTC (rev 185253)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><span class="cx"> layer at (0,0) size 800x600
</span><span class="cx"> RenderView at (0,0) size 800x600
</span><del>-layer at (0,0) size 800x128
- RenderBlock {HTML} at (0,0) size 800x128
- RenderBody {BODY} at (8,8) size 784x100
</del><ins>+layer at (0,0) size 800x129
+ RenderBlock {HTML} at (0,0) size 800x129
+ RenderBody {BODY} at (8,8) size 784x101
</ins><span class="cx"> RenderBlock (anonymous) at (0,0) size 784x80
</span><span class="cx"> RenderText {#text} at (0,0) size 654x19
</span><span class="cx"> text run at (0,0) width 654: "This test checks that the text-overflow: ellipsis property is handled correctly when using an SVG font."
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> text run at (0,40) width 529: "Pass if some text is shown followed by an ellipsis (NOT just the ellipsis by itself). "
</span><span class="cx"> RenderBR {BR} at (529,40) size 0x19
</span><span class="cx"> RenderBR {BR} at (0,60) size 0x19
</span><del>-layer at (8,88) size 182x20 clip at (9,89) size 180x18 scrollWidth 333
- RenderBlock {DIV} at (0,80) size 182x20 [border: (1px solid #000000)]
- RenderText {#text} at (1,2) size 334x16
</del><ins>+layer at (8,88) size 182x21 clip at (9,89) size 180x19 scrollWidth 333
+ RenderBlock {DIV} at (0,80) size 182x21 [border: (1px solid #000000)]
+ RenderText {#text} at (1,2) size 334x17
</ins><span class="cx"> text run at (1,2) width 334: "abc abc abc abc abc abc abc abc abc abc"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorsvgtexttextoverflowellipsissvgfontkerningligaturesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/svg/text/text-overflow-ellipsis-svgfont-kerning-ligatures-expected.txt (185252 => 185253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/svg/text/text-overflow-ellipsis-svgfont-kerning-ligatures-expected.txt 2015-06-05 17:19:47 UTC (rev 185252)
+++ trunk/LayoutTests/platform/ios-simulator/svg/text/text-overflow-ellipsis-svgfont-kerning-ligatures-expected.txt 2015-06-05 17:41:55 UTC (rev 185253)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><span class="cx"> layer at (0,0) size 800x600
</span><span class="cx"> RenderView at (0,0) size 800x600
</span><del>-layer at (0,0) size 800x148
- RenderBlock {HTML} at (0,0) size 800x148
- RenderBody {BODY} at (8,8) size 784x120
</del><ins>+layer at (0,0) size 800x149
+ RenderBlock {HTML} at (0,0) size 800x149
+ RenderBody {BODY} at (8,8) size 784x121
</ins><span class="cx"> RenderBlock (anonymous) at (0,0) size 784x100
</span><span class="cx"> RenderText {#text} at (0,0) size 777x39
</span><span class="cx"> text run at (0,0) width 777: "This test checks that the text-overflow: ellipsis property is handled correctly when using an SVG font and having kerning"
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> text run at (0,60) width 529: "Pass if some text is shown followed by an ellipsis (NOT just the ellipsis by itself). "
</span><span class="cx"> RenderBR {BR} at (529,60) size 0x19
</span><span class="cx"> RenderBR {BR} at (0,80) size 0x19
</span><del>-layer at (8,108) size 182x20 clip at (9,109) size 180x18 scrollWidth 333
- RenderBlock {DIV} at (0,100) size 182x20 [border: (1px solid #000000)]
- RenderText {#text} at (1,2) size 334x16
</del><ins>+layer at (8,108) size 182x21 clip at (9,109) size 180x19 scrollWidth 333
+ RenderBlock {DIV} at (0,100) size 182x21 [border: (1px solid #000000)]
+ RenderText {#text} at (1,2) size 334x17
</ins><span class="cx"> text run at (1,2) width 334: "abc abc abc abc abc abc abc abc abc abc"
</span></span></pre></div>
<a id="trunkLayoutTestssvgcustomsvgfontsnolatinglyphexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/svg/custom/svg-fonts-no-latin-glyph-expected.txt (185252 => 185253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/custom/svg-fonts-no-latin-glyph-expected.txt 2015-06-05 17:19:47 UTC (rev 185252)
+++ trunk/LayoutTests/svg/custom/svg-fonts-no-latin-glyph-expected.txt 2015-06-05 17:41:55 UTC (rev 185253)
</span><span class="lines">@@ -2,4 +2,3 @@
</span><span class="cx">
</span><span class="cx"> あ
</span><span class="cx"> character height is 16
</span><del>-PASS
</del></span></pre></div>
<a id="trunkLayoutTestssvgcustomsvgfontsnolatinglyphhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/svg/custom/svg-fonts-no-latin-glyph.html (185252 => 185253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/custom/svg-fonts-no-latin-glyph.html 2015-06-05 17:19:47 UTC (rev 185252)
+++ trunk/LayoutTests/svg/custom/svg-fonts-no-latin-glyph.html 2015-06-05 17:41:55 UTC (rev 185253)
</span><span class="lines">@@ -5,30 +5,20 @@
</span><span class="cx"> src: url(resources/no-latin-glyph-font.svg#Font) format("svg");
</span><span class="cx"> }
</span><span class="cx"> </style>
</span><del>-<script>
-function doTest() {
- var height = document.getElementById('text').offsetHeight;
- var result = document.getElementById('result');
- result.innerHTML = 'character height is ' + height + '<br />';
- if (height == 16)
- result.innerHTML += 'PASS';
- else
- result.innerHTML += 'FAIL';
- if (window.testRunner)
- testRunner.notifyDone();
-}
-</script>
</del><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx"> <p>Following character should be rendered as an exlamation.</p>
</span><span class="cx"> <span id="text" style="font-family: f;">&#x3042;</span>
</span><span class="cx"> <div id="result"></div>
</span><span class="cx"> <script>
</span><del>-document.body.offsetWidth;
-if (window.testRunner) {
</del><ins>+if (window.testRunner)
</ins><span class="cx"> testRunner.dumpAsText();
</span><del>- testRunner.waitUntilDone();
-}
-window.addEventListener('load', doTest, true);
</del><ins>+// Wait until the font is ready for measuring the text height
+document.body.offsetWidth;
+window.addEventListener("load", function() {
+ var height = document.getElementById('text').offsetHeight;
+ var result = document.getElementById('result');
+ result.innerHTML = 'character height is ' + height;
+});
</ins><span class="cx"> </script>
</span><span class="cx"> </body>
</span></span></pre>
</div>
</div>
</body>
</html>