Skip to site navigation (Press enter)

[webkit-changes] [181390] trunk/LayoutTests

mmaxfield Wed, 11 Mar 2015 09:32:56 -0700

Title: [181390] trunk/LayoutTests

Revision: 181390
Author: mmaxfi...@apple.com
Date: 2015-03-11 09:31:53 -0700 (Wed, 11 Mar 2015)

Log Message

Test gardening after r181278


Unreviewed.

Until Windows adopts the SVG -> OTF Converter, we should mark this test as Mac-only.

* platform/mac/svg/fonts/resources/svg-font-general.svg: Renamed from LayoutTests/svg/fonts/resources/svg-font-general.svg.
* platform/mac/svg/fonts/svg-font-general-expected.html: Renamed from LayoutTests/svg/fonts/svg-font-general-expected.html.
* platform/mac/svg/fonts/svg-font-general.html: Renamed from LayoutTests/svg/fonts/svg-font-general.html.

Modified Paths

trunk/LayoutTests/ChangeLog

Added Paths

trunk/LayoutTests/platform/mac/svg/fonts/
trunk/LayoutTests/platform/mac/svg/fonts/resources/
trunk/LayoutTests/platform/mac/svg/fonts/resources/svg-font-general.svg
trunk/LayoutTests/platform/mac/svg/fonts/svg-font-general-expected.html
trunk/LayoutTests/platform/mac/svg/fonts/svg-font-general.html

Removed Paths

trunk/LayoutTests/svg/fonts/

Diff

Modified: trunk/LayoutTests/ChangeLog (181389 => 181390)


--- trunk/LayoutTests/ChangeLog	2015-03-11 15:58:13 UTC (rev 181389)
+++ trunk/LayoutTests/ChangeLog	2015-03-11 16:31:53 UTC (rev 181390)
@@ -1,3 +1,15 @@
+2015-03-11  Myles C. Maxfield  <mmaxfi...@apple.com>
+
+        Test gardening after r181278
+
+        Unreviewed.
+
+        Until Windows adopts the SVG -> OTF Converter, we should mark this test as Mac-only.
+
+        * platform/mac/svg/fonts/resources/svg-font-general.svg: Renamed from LayoutTests/svg/fonts/resources/svg-font-general.svg.
+        * platform/mac/svg/fonts/svg-font-general-expected.html: Renamed from LayoutTests/svg/fonts/svg-font-general-expected.html.
+        * platform/mac/svg/fonts/svg-font-general.html: Renamed from LayoutTests/svg/fonts/svg-font-general.html.
+
 2015-03-11  Commit Queue  <commit-qu...@webkit.org>
 
         Unreviewed, rolling out r181367.

Copied: trunk/LayoutTests/platform/mac/svg/fonts/resources/svg-font-general.svg (from rev 181389, trunk/LayoutTests/svg/fonts/resources/svg-font-general.svg) (0 => 181390)


--- trunk/LayoutTests/platform/mac/svg/fonts/resources/svg-font-general.svg	                        (rev 0)
+++ trunk/LayoutTests/platform/mac/svg/fonts/resources/svg-font-general.svg	2015-03-11 16:31:53 UTC (rev 181390)
@@ -0,0 +1,48 @@
+<?xml version="1.0" standalone="yes"?>
+<svg  version="1.1" viewBox="0 0 160 160" xmlns = 'http://www.w3.org/2000/svg' xmlns:xlink="http://www.w3.org/1999/xlink">
+  <defs>
+    <font id="Litherum" horiz-adv-x="1000">
+      <font-face units-per-em="1000" ascent="1000" descent="0">
+      </font-face>
+    <glyph unicode="A" horiz-adv-x="1000" d="M 500 0 H 1000 V 600 H 500 z"/>
+    <glyph unicode="B" horiz-adv-x="1000"/>
+    </font>
+    <font id="Litherum2" horiz-adv-x="1000" horiz-origin-x="500" horiz-origin-y="300">
+      <font-face units-per-em="1000" ascent="1000" descent="0">
+      </font-face>
+    <glyph unicode="A" horiz-adv-x="1000" d="M 0 -300 H 500 V 300 H 0 z"/>
+    </font>
+    <font id="Litherum3" horiz-adv-x="1000">
+      <font-face font-weight="normal" font-style="normal" units-per-em="1000" cap-height="600" x-height="400" ascent="1000" descent="0">
+      </font-face>
+    <glyph unicode="A" d="M 0 0 H 500 V 600 H 0 z"/>
+    <glyph unicode="BC" horiz-adv-x="500" d="M 0 0 H 500 L 250 600 z"/>
+    <glyph unicode="&#x672c;" horiz-adv-x="500" d="M 0 0 H 500 L 0 600 z"/>
+    </font>
+    <font id="Litherum4" horiz-adv-x="500">
+      <font-face font-weight="normal" font-style="normal" units-per-em="1000" cap-height="600" x-height="400" ascent="1000" descent="0">
+      </font-face>
+    <glyph unicode="A" horiz-adv-x="1000" d="M 0 0 H 500 V 600 H 0 z"/>
+    <glyph unicode="D" horiz-adv-x="500" d="M 0 0 H 500 L 250 600 z"/>
+    <glyph unicode="&#x672c;" horiz-adv-x="500" d="M 0 0 H 500 L 0 600 z"/>
+    </font>
+    <font id="Litherum5" horiz-adv-x="500">
+    <glyph unicode="A" horiz-adv-x="1000" d="M 0 0 H 250 V 600 H 0 z"/>
+    </font>
+    <font id="Litherum6">
+      <font-face units-per-em="1000" ascent="1000" descent="1000">
+      </font-face>
+    <glyph unicode="A" horiz-adv-x="1000" d="M 0 0 V -1000 H 1000 V 1000 H 0 z"/>
+    <glyph unicode="B" horiz-adv-x="1000" d="M 0 0 H 1000 V 1000 H 0 z"/>
+    </font>
+    <font horiz-adv-x="1000" id="Litherum7">
+      <font-face units-per-em="1000" ascent="1000" descent="0"/>
+      <glyph unicode="A" horiz-adv-x="1000" d="M 500 0 H 1000 V 600 z"/>
+    </font>
+    <font horiz-adv-x="1000" id="Litherum8">
+      <font-face units-per-em="1000" ascent="1000" descent="0"/>
+      <glyph unicode="A" horiz-adv-x="1000" d="M 500 0 H 1000 V 600 z"/>
+      <missing-glyph d="M0 0V1000H1000V0z"/>
+    </font>
+  </defs>
+</svg>

Copied: trunk/LayoutTests/platform/mac/svg/fonts/svg-font-general-expected.html (from rev 181389, trunk/LayoutTests/svg/fonts/svg-font-general-expected.html) (0 => 181390)


--- trunk/LayoutTests/platform/mac/svg/fonts/svg-font-general-expected.html	                        (rev 0)
+++ trunk/LayoutTests/platform/mac/svg/fonts/svg-font-general-expected.html	2015-03-11 16:31:53 UTC (rev 181390)
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html>
+<head>
+<style>
+@font-face {
+    font-family: 'Litherum';
+    src: url("resources/svg-font-general.svg#Litherum2") format(svg);
+}
+@font-face {
+    font-family: 'Litherum4';
+    src: url("resources/svg-font-general.svg#Litherum4") format(svg);
+}
+@font-face {
+    font-family: 'Litherum8';
+    src: url("resources/svg-font-general.svg#Litherum8") format(svg);
+}
+.a {
+    font-family: 'Litherum4';
+}
+</style>
+</head>
+<body style="-webkit-font-smoothing: none;">
+These tests test horiz-origin, fallback of horiz-adv property, glyph rendering, ligatures, svg -&gt; native fallback, and units-per-em, respectively.
+<div><span style="font: 50px Litherum;">AAA</span><span style="position: relative; left: 50px;">AAA</span></div>
+<div><span style="font: 50px Litherum4;">AAA</span>AAA</div>
+<div><div style="display: inline-block; width: 150px; height: 52px; position: relative;"><div style="position: absolute; width: 25px; height: 30px; left: 0px; bottom: 0px; background: black;"></div><div style="position: absolute; width: 25px; height: 30px; left: 50px; bottom: 0px; background: black;"></div><div style="position: absolute; width: 25px; height: 30px; left: 100px; bottom: 0px; background: black;"></div></div>AAA</div>
+<div style="height: 7px;"></div>
+<div><span style="font: 50px Litherum4;">D</span><span style="font-size: 50px;">A</span></div>
+<div style="font-size: 50px;"><span class="a">A</span>Z<span class="a">A</span>Z<span class="a">A</span></span><span class="a">&#x672c;</span>N<span class="a">&#x672c;</span>N<span class="a">&#x672c;</span></span></div>
+<div style="display: inline-block; position: relative; width: 200px; height: 206px;"><div style="position: absolute; top: 2px; left: 0px; width: 50px; height: 100px; background: black;"></div><div style="position: absolute; top: 2px; left: 50px; width: 50px; height: 50px; background: black;"></div><div style="position: absolute; bottom: -1px; left: 0px; width: 50px; height: 100px; background: black;"></div><div style="position: absolute; bottom: 49px; left: 50px; width: 50px; height: 50px; background: black;"></div></div>
+<div style="font: 50px Litherum8; position: absolute; left: 400px; top: 100px;">A</div>
+</body>
+</html>

Copied: trunk/LayoutTests/platform/mac/svg/fonts/svg-font-general.html (from rev 181389, trunk/LayoutTests/svg/fonts/svg-font-general.html) (0 => 181390)


--- trunk/LayoutTests/platform/mac/svg/fonts/svg-font-general.html	                        (rev 0)
+++ trunk/LayoutTests/platform/mac/svg/fonts/svg-font-general.html	2015-03-11 16:31:53 UTC (rev 181390)
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+<head>
+<style>
+@font-face {
+    font-family: 'Litherum';
+    src: url("resources/svg-font-general.svg#Litherum") format(svg);
+}
+@font-face {
+    font-family: 'Litherum3';
+    src: url("resources/svg-font-general.svg#Litherum3") format(svg);
+}
+@font-face {
+    font-family: 'Litherum5';
+    src: url("resources/svg-font-general.svg#Litherum5") format(svg);
+}
+@font-face {
+    font-family: 'Litherum6';
+    src: url("resources/svg-font-general.svg#Litherum6") format(svg);
+}
+@font-face {
+    font-family: 'Litherum7';
+    src: url("resources/svg-font-general.svg#Litherum7") format(svg);
+}
+</style>
+</head>
+<body style="-webkit-font-smoothing: none;">
+These tests test horiz-origin, fallback of horiz-adv property, glyph rendering, ligatures, svg -&gt; native fallback, and units-per-em, respectively.
+<div><span style="font: 50px Litherum;">AAAB</span>AAA</div>
+<div><span style="font: 50px Litherum3;">AAA</span>AAA</div>
+<div><span style="font: 50px Litherum3;">AAA</span>AAA</div>
+<div><span style="font: 50px Litherum3;">BC</span><span style="font: 50px Litherum5;">A</span></div>
+<div style="font-size: 50px;"><span style="font-family: Litherum3, Times;">AZAZA</span><span style="font-family: Times, Litherum3">&#x672c;N&#x672c;N&#x672c;</span></div>
+<div style="font-size: 50px;"><span style="font-family: Litherum6;">AB</span><br/><span style="font-family: Litherum6;">AB</span></div>
+<div style="font: 50px Litherum7; position: absolute; left: 400px; top: 100px;">A</div>
+</body>
+</html>

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes