Last gardening after r177774
authormmaxfield@apple.com <mmaxfield@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 2 Mar 2015 23:51:23 +0000 (23:51 +0000)
committermmaxfield@apple.com <mmaxfield@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 2 Mar 2015 23:51:23 +0000 (23:51 +0000)
Unreviewed.

* fast/text/font-kerning-expected.html:
* fast/text/font-variant-ligatures-expected.html:
* fast/text/whitespace/inline-whitespace-wrapping-7-expected.html:
* fast/text/whitespace/inline-whitespace-wrapping-7.html:
* mathml/presentation/scripts-subsup-expected.html:
* mathml/presentation/scripts-subsup.html:
* platform/mac/TestExpectations:
* platform/mac/fast/text/multiple-codeunit-vertical-upright-expected.html:
* platform/mac/fast/text/multiple-codeunit-vertical-upright.html:
* platform/mac/fast/text/resources/multiple-codeunit-vertical-upright.otf: Removed.
* svg/text/svg-font-word-rounding-hacks-spaces-expected.html:
* svg/text/svg-font-word-rounding-hacks-spaces.html:
* svg/text/tspan-outline-expected.svg:
* svg/text/tspan-outline.html:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@180904 268f45cc-cd09-0410-ab3c-d52691b4dbfc

16 files changed:
LayoutTests/ChangeLog
LayoutTests/fast/text/font-kerning-expected.html
LayoutTests/fast/text/font-variant-ligatures-expected.html
LayoutTests/fast/text/whitespace/inline-whitespace-wrapping-7-expected.html
LayoutTests/fast/text/whitespace/inline-whitespace-wrapping-7.html
LayoutTests/imported/mozilla/svg/dynamic-text-07-expected.svg
LayoutTests/mathml/presentation/scripts-subsup-expected.html
LayoutTests/mathml/presentation/scripts-subsup.html
LayoutTests/platform/mac/TestExpectations
LayoutTests/platform/mac/fast/text/multiple-codeunit-vertical-upright-expected.html
LayoutTests/platform/mac/fast/text/multiple-codeunit-vertical-upright.html
LayoutTests/platform/mac/fast/text/resources/multiple-codeunit-vertical-upright.otf [deleted file]
LayoutTests/svg/text/svg-font-word-rounding-hacks-spaces-expected.html
LayoutTests/svg/text/svg-font-word-rounding-hacks-spaces.html
LayoutTests/svg/text/tspan-outline-expected.svg
LayoutTests/svg/text/tspan-outline.html

index b25ca97..270523a 100644 (file)
@@ -1,3 +1,24 @@
+2015-03-02  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Last gardening after r177774
+
+        Unreviewed.
+
+        * fast/text/font-kerning-expected.html:
+        * fast/text/font-variant-ligatures-expected.html:
+        * fast/text/whitespace/inline-whitespace-wrapping-7-expected.html:
+        * fast/text/whitespace/inline-whitespace-wrapping-7.html:
+        * mathml/presentation/scripts-subsup-expected.html:
+        * mathml/presentation/scripts-subsup.html:
+        * platform/mac/TestExpectations:
+        * platform/mac/fast/text/multiple-codeunit-vertical-upright-expected.html:
+        * platform/mac/fast/text/multiple-codeunit-vertical-upright.html:
+        * platform/mac/fast/text/resources/multiple-codeunit-vertical-upright.otf: Removed.
+        * svg/text/svg-font-word-rounding-hacks-spaces-expected.html:
+        * svg/text/svg-font-word-rounding-hacks-spaces.html:
+        * svg/text/tspan-outline-expected.svg:
+        * svg/text/tspan-outline.html:
+
 2015-03-02  Mark Lam  <mark.lam@apple.com>
 
         The InspectorTimelineAgent should gracefully handle attempts to start more than once.
index 6a0d1d9..f8aa16e 100644 (file)
@@ -1,11 +1,12 @@
 <style>
-    .kerned { text-rendering: optimizelegibility; }
+    .notkerned { text-rendering: optimizeSpeed; }
+    .kerned { text-rendering: optimizeLegibility; }
 </style>
 <body style="font-size: 36px;">
-    <div>AVAVAVAV</div>
-    <div>AVAVAVAV</div>
+    <div class="notkerned">AVAVAVAV</div>
     <div class="kerned">AVAVAVAV</div>
-    <div>AVAVAVAV</div>
+    <div class="kerned">AVAVAVAV</div>
+    <div class="notkerned">AVAVAVAV</div>
     <div class="kerned">AVAVAVAV</div>
     <div class="kerned">AVAVAVAV</div>
 </body>
index eb82e6b..d7ef4c8 100644 (file)
@@ -1,11 +1,12 @@
 <style>
-    .ligatures { text-rendering: optimizelegibility; }
+    .noligatures { text-rendering: optimizeSpeed; }
+    .ligatures { text-rendering: optimizeLegibility; }
 </style>
 <body style="font-size: 36px;">
-    <div>file</div>
-    <div>file</div>
+    <div class="noligatures">file</div>
     <div class="ligatures">file</div>
-    <div>file</div>
+    <div class="ligatures">file</div>
+    <div class="noligatures">file</div>
     <div class="ligatures">file</div>
     <div class="ligatures">file</div>
 </body>
index bda6cd8..485f409 100644 (file)
@@ -3,6 +3,7 @@
 <style>
     #container {
         float: right;
+        font-family: Ahem;
     }
     .link
     {
index cafd26b..4ae41a4 100644 (file)
@@ -7,5 +7,5 @@
 
   <!-- From https://bugzilla.mozilla.org/show_bug.cgi?id=717870 -->
 
-  <text x="10" y="50" font-size="50">A B</text>
+  <text x="10" y="50" font-size="50">A <tspan>B</tspan></text>
 </svg>
index 2db7737..8165b87 100644 (file)
   <body>
 
     <!-- The sub/sup scripts should be hidden by the black rectangles -->
-    <table style="position: absolute; top: 10px; left: 10px;">
+    <table style="position: absolute; top: 10px; left: 10px; font-family: Ahem;">
       <tr>
         <td style="text-align: left; vertical-align: top;">
-          <math>
+          <math style="font-family: Ahem;">
             <msub>
               <mtext>X</mtext>
               <mtext style="visibility: hidden;">X</mtext>
@@ -35,7 +35,7 @@
           </math>
         </td>
         <td style="text-align: left;">
-          <math>
+          <math style="font-family: Ahem;">
             <msubsup>
               <mtext>X</mtext>
               <mtext style="visibility: hidden;">X</mtext>
@@ -44,7 +44,7 @@
           </math>
         </td>
         <td style="text-align: left; vertical-align: bottom;">
-          <math>
+          <math style="font-family: Ahem;">
             <msup>
               <mtext>X</mtext>
               <mtext style="visibility: hidden;">X</mtext>
@@ -54,7 +54,7 @@
       </tr>
     </table>
 
-    <table style="position: absolute; top: 10px; left: 10px;">
+    <table style="position: absolute; top: 10px; left: 10px; font-family: Ahem;">
       <tr>
         <td style="text-align: left; vertical-align: top;">
           <span style="visibility: hidden;">X</span><span style="vertical-align: -25%;">X</span>
@@ -63,7 +63,7 @@
           <span style="visibility: hidden;">X</span><span>X<br/>X</span>
         </td>
         <td style="text-align: left; vertical-align: bottom;">
-          <span style="visibility: hidden;">X</span><span style="vertical-align: +25%;">X</span>
+          <span style="visibility: hidden;">X</span><span style="vertical-align: +50%;">X</span>
         </td>
       </tr>
     </table>
index b305c5b..7e34b80 100644 (file)
   <body>
 
     <!-- The sub/sup scripts should be hidden by the black rectangles -->
-    <table style="position: absolute; top: 10px; left: 10px;">
+    <table style="position: absolute; top: 10px; left: 10px; font-family: Ahem;">
       <tr>
         <td style="text-align: left; vertical-align: top;">
-          <math>
+          <math style="font-family: Ahem;">
             <msub>
               <mtext>X</mtext>
               <mtext>X</mtext>
@@ -35,7 +35,7 @@
           </math>
         </td>
         <td style="text-align: left;">
-          <math>
+          <math style="font-family: Ahem;">
             <msubsup>
               <mtext>X</mtext>
               <mtext>X</mtext>
@@ -44,7 +44,7 @@
           </math>
         </td>
         <td style="text-align: left; vertical-align: bottom;">
-          <math>
+          <math style="font-family: Ahem;">
             <msup>
               <mtext>X</mtext>
               <mtext>X</mtext>
@@ -54,7 +54,7 @@
       </tr>
     </table>
 
-    <table style="position: absolute; top: 10px; left: 10px;">
+    <table style="position: absolute; top: 10px; left: 10px; font-family: Ahem;">
       <tr>
         <td style="text-align: left; vertical-align: top;">
           <span style="visibility: hidden;">X</span><span style="vertical-align: -25%;">X</span>
@@ -63,7 +63,7 @@
           <span style="visibility: hidden;">X</span><span>X<br/>X</span>
         </td>
         <td style="text-align: left; vertical-align: bottom;">
-          <span style="visibility: hidden;">X</span><span style="vertical-align: +25%;">X</span>
+          <span style="visibility: hidden;">X</span><span style="vertical-align: +50%;">X</span>
         </td>
       </tr>
     </table>
index bc91648..8992802 100644 (file)
@@ -1213,22 +1213,14 @@ webkit.org/b/93560 fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data.
 fast/canvas/canvas-draw-canvas-on-canvas-shadow.html [ Pass Failure ]
 fast/canvas/canvas-fillRect-gradient-shadow.html [ Pass Failure ]
 
-# Kerning, Ligatures, and Printer Fonts caused these tests to fail
-webkit.org/b/139968 fast/text/font-kerning.html [ ImageOnlyFailure ]
-webkit.org/b/139968 fast/text/font-variant-ligatures.html [ ImageOnlyFailure ]
-webkit.org/b/139968 fast/text/whitespace/inline-whitespace-wrapping-7.html [ ImageOnlyFailure ]
-webkit.org/b/139968 fast/text/word-space-between-inlines.html [ ImageOnlyFailure ]
-webkit.org/b/139968 imported/mozilla/svg/dynamic-text-07.svg [ ImageOnlyFailure ]
-webkit.org/b/139968 mathml/presentation/scripts-subsup.html [ ImageOnlyFailure ]
-webkit.org/b/139968 platform/mac/fast/text/multiple-codeunit-vertical-upright.html [ ImageOnlyFailure ]
-webkit.org/b/139968 svg/text/svg-font-word-rounding-hacks-spaces.html [ ImageOnlyFailure ]
-webkit.org/b/139968 svg/text/tspan-outline.html [ ImageOnlyFailure ]
-webkit.org/b/139968 svg/transforms/transformed-text-fill-gradient.html [ ImageOnlyFailure ]
+# SVG gradients are not bit-for-bit equivalent through a scale.
+webkit.org/b/142192 svg/transforms/transformed-text-fill-gradient.html [ ImageOnlyFailure ]
 
 # Word-spacing is incorrectly applied
 webkit.org/b/142086 fast/css/word-spacing-between-blocks.html [ ImageOnlyFailure ]
 webkit.org/b/142086 fast/css/word-spacing-between-inlines.html [ ImageOnlyFailure ]
 webkit.org/b/142086 fast/css/word-spacing-characters.html [ ImageOnlyFailure ]
+webkit.org/b/142086 fast/text/word-space-between-inlines.html [ ImageOnlyFailure ]
 
 # Underlines' starting and ending positions need to be pixel-snapped
 webkit.org/b/142087 fast/css3-text/css3-text-decoration/no-gap-between-two-rounded-textboxes.html [ ImageOnlyFailure ]
index 967eb96..ce33c15 100644 (file)
@@ -1,14 +1,9 @@
 <!DOCTYPE html>
 <html>
 <head>
-<style>
-@font-face {
-    font-family: "Litherum";
-    src: url("resources/multiple-codeunit-vertical-upright.otf") format("opentype");
-}
-</style>
 </head>
 <body style="-webkit-font-smoothing: none;">
-<div style="font: 96px Litherum; position: relative; left: 3.5px; top: 1px;">&#x2000b;</div>
+<div style="position: absolute; top: 100px;">This test makes sure that upright vertical text is rendered the same as horizontal text.</div>
+<div style="font: 96px Times; position: relative; left: 29px; top: -23px; display: inline-block;">&#x2000b;</div>
 </body>
 </html>
index 3969ab1..1ac1365 100644 (file)
@@ -1,14 +1,9 @@
 <!DOCTYPE html>
 <html>
 <head>
-<style>
-@font-face {
-    font-family: "Litherum";
-    src: url("resources/multiple-codeunit-vertical-upright.otf") format("opentype");
-}
-</style>
 </head>
 <body style="-webkit-font-smoothing: none;">
-<div style="font: 96px Litherum; -webkit-writing-mode: vertical-rl; -webkit-text-orientation: upright;">&#x2000b;</div>
+<div style="position: absolute; top: 100px;">This test makes sure that upright vertical text is rendered the same as horizontal text.</div>
+<div style="font: 96px Times; -webkit-writing-mode: vertical-rl; -webkit-text-orientation: upright;">&#x2000b;</div>
 </body>
 </html>
diff --git a/LayoutTests/platform/mac/fast/text/resources/multiple-codeunit-vertical-upright.otf b/LayoutTests/platform/mac/fast/text/resources/multiple-codeunit-vertical-upright.otf
deleted file mode 100644 (file)
index df68eac..0000000
Binary files a/LayoutTests/platform/mac/fast/text/resources/multiple-codeunit-vertical-upright.otf and /dev/null differ
index 8bcfae4..13f206a 100644 (file)
@@ -17,8 +17,8 @@
 </style>
 </head>
 <body>
-This test makes sure that text drawn with an SVG font with word-wrapping hacks has spaces.
-The test is successful if the space between the two boxes below is the same as the width of each of the boxes.
+<div style="display: none;">This test makes sure that text drawn with an SVG font with word-wrapping hacks has spaces.
+The test is successful if the space between the two boxes below is the same as the width of each of the boxes.</div>
 <div><div class="blackbox"></div><div class="whitebox"></div><div class="blackbox"></div></div>
 </body>
 </html>
index 94ac454..16e0afa 100644 (file)
@@ -13,8 +13,8 @@ if (window.internals)
 </script>
 </head>
 <body>
-This test makes sure that text drawn with an SVG font with word-wrapping hacks has spaces.
-The test is successful if the space between the two boxes below is the same as the width of each of the boxes.
+<div style="display: none;">This test makes sure that text drawn with an SVG font with word-wrapping hacks has spaces.
+The test is successful if the space between the two boxes below is the same as the width of each of the boxes.</div>
 <div style="font: 14px Litherum;">a a</div>
 </body>
 </html>
index c1fbdd6..113b88a 100644 (file)
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="800" height="100">
        <style>
-       text { font: 32px sans-serif; }
+       text { font: 32px Ahem; }
        </style>
        
        <text y="40" tabindex="2" fill="green">[object SVGTSpanElement]</text>
index 189880b..a4b9eb6 100644 (file)
@@ -4,7 +4,7 @@
        <style>
        * { margin: 0; padding: 0; }
        *:focus { fill: green }
-       text { font: 32px sans-serif; }
+       text { font: 32px Ahem; }
        </style>
        
        <text y="40"><tspan tabindex="2">Test didn't run</tspan></text>