Diff
Modified: trunk/LayoutTests/ChangeLog (185252 => 185253)
--- trunk/LayoutTests/ChangeLog 2015-06-05 17:19:47 UTC (rev 185252)
+++ trunk/LayoutTests/ChangeLog 2015-06-05 17:41:55 UTC (rev 185253)
@@ -1,3 +1,17 @@
+2015-06-05 Said Abou-Hallawa <[email protected]>
+
+ [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:
+
2015-06-05 Zalan Bujtas <[email protected]>
[iOS] Mask layer now is part of the layer tree output.
Added: trunk/LayoutTests/platform/ios-simulator/svg/custom/svg-fonts-no-latin-glyph-expected.txt (0 => 185253)
--- 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)
@@ -0,0 +1,4 @@
+Following character should be rendered as an exlamation.
+
+あ
+character height is 17
Modified: trunk/LayoutTests/platform/ios-simulator/svg/custom/svg-fonts-segmented-expected.txt (185252 => 185253)
--- 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)
@@ -4,5 +4,5 @@
RenderBlock {html} at (0,0) size 800x137
RenderBody {body} at (8,40) size 784x57
RenderBlock {p} at (0,0) size 784x57
- RenderText {#text} at (0,2) size 256x52
+ RenderText {#text} at (0,2) size 256x53
text run at (0,2) width 256: "ABCdefoooO"
Added: trunk/LayoutTests/platform/ios-simulator/svg/custom/svg-fonts-with-no-element-reference-expected.txt (0 => 185253)
--- 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)
@@ -0,0 +1,11 @@
+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."
Modified: trunk/LayoutTests/platform/ios-simulator/svg/text/text-overflow-ellipsis-svgfont-expected.txt (185252 => 185253)
--- 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)
@@ -1,8 +1,8 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x128
- RenderBlock {HTML} at (0,0) size 800x128
- RenderBody {BODY} at (8,8) size 784x100
+layer at (0,0) size 800x129
+ RenderBlock {HTML} at (0,0) size 800x129
+ RenderBody {BODY} at (8,8) size 784x101
RenderBlock (anonymous) at (0,0) size 784x80
RenderText {#text} at (0,0) size 654x19
text run at (0,0) width 654: "This test checks that the text-overflow: ellipsis property is handled correctly when using an SVG font."
@@ -12,7 +12,7 @@
text run at (0,40) width 529: "Pass if some text is shown followed by an ellipsis (NOT just the ellipsis by itself). "
RenderBR {BR} at (529,40) size 0x19
RenderBR {BR} at (0,60) size 0x19
-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
+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
text run at (1,2) width 334: "abc abc abc abc abc abc abc abc abc abc"
Modified: trunk/LayoutTests/platform/ios-simulator/svg/text/text-overflow-ellipsis-svgfont-kerning-ligatures-expected.txt (185252 => 185253)
--- 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)
@@ -1,8 +1,8 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x148
- RenderBlock {HTML} at (0,0) size 800x148
- RenderBody {BODY} at (8,8) size 784x120
+layer at (0,0) size 800x149
+ RenderBlock {HTML} at (0,0) size 800x149
+ RenderBody {BODY} at (8,8) size 784x121
RenderBlock (anonymous) at (0,0) size 784x100
RenderText {#text} at (0,0) size 777x39
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"
@@ -13,7 +13,7 @@
text run at (0,60) width 529: "Pass if some text is shown followed by an ellipsis (NOT just the ellipsis by itself). "
RenderBR {BR} at (529,60) size 0x19
RenderBR {BR} at (0,80) size 0x19
-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
+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
text run at (1,2) width 334: "abc abc abc abc abc abc abc abc abc abc"
Modified: trunk/LayoutTests/svg/custom/svg-fonts-no-latin-glyph-expected.txt (185252 => 185253)
--- 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)
@@ -2,4 +2,3 @@
あ
character height is 16
-PASS
Modified: trunk/LayoutTests/svg/custom/svg-fonts-no-latin-glyph.html (185252 => 185253)
--- 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)
@@ -5,30 +5,20 @@
src: url(resources/no-latin-glyph-font.svg#Font) format("svg");
}
</style>
-<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>
</head>
<body>
<p>Following character should be rendered as an exlamation.</p>
<span id="text" style="font-family: f;">あ</span>
<div id="result"></div>
<script>
-document.body.offsetWidth;
-if (window.testRunner) {
+if (window.testRunner)
testRunner.dumpAsText();
- testRunner.waitUntilDone();
-}
-window.addEventListener('load', doTest, true);
+// 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;
+});
</script>
</body>
