Reviewed by Dave Hyatt.
authormitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 2 Feb 2008 00:02:52 +0000 (00:02 +0000)
committermitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 2 Feb 2008 00:02:52 +0000 (00:02 +0000)
        - address the remaining tests listed under <rdar://problem/5075790> Layout tests that depend on certain fonts don't match Mac results

        * fast/text/cg-fallback-bolding.html: Changed to use Ahem instead of
        Geneva.
        * fast/text/international/bidi-fallback-font-weight.html: Made Mac-only.
        * platform/mac/fast/text/cg-fallback-bolding-expected.checksum: Updated.
        * platform/mac/fast/text/cg-fallback-bolding-expected.png: Updated
        * platform/mac/fast/text/cg-fallback-bolding-expected.txt: Updated.
        * platform/mac/fast/text/international/bidi-fallback-font-weight.html: Copied from LayoutTests/fast/text/international/bidi-fallback-font-weight.html.
        * platform/win/Skipped: Removed passing tests and categorized remaining
        failures.
        * platform/win/svg/W3C-SVG-1.1: Added.
        * platform/win/svg/W3C-SVG-1.1/resources: Added.
        * platform/win/svg/W3C-SVG-1.1/resources/Mac-compatible-font-fallback.css: Added.
        * platform/win/svg/W3C-SVG-1.1/resources/run-webkit-tests-epilogue.html: Added.
        * platform/win/svg/W3C-SVG-1.1/resources/run-webkit-tests-prologue.html: Added.
        * svg/text/text-tselect-02-f.svg: Added @font-face rule to use Lucida
        Grande for Hebrew.

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

LayoutTests/ChangeLog
LayoutTests/fast/text/cg-fallback-bolding.html
LayoutTests/platform/mac/fast/text/cg-fallback-bolding-expected.checksum
LayoutTests/platform/mac/fast/text/cg-fallback-bolding-expected.png
LayoutTests/platform/mac/fast/text/cg-fallback-bolding-expected.txt
LayoutTests/platform/mac/fast/text/international/bidi-fallback-font-weight.html [moved from LayoutTests/fast/text/international/bidi-fallback-font-weight.html with 100% similarity]
LayoutTests/platform/win/Skipped
LayoutTests/platform/win/svg/W3C-SVG-1.1/resources/Mac-compatible-font-fallback.css [new file with mode: 0644]
LayoutTests/platform/win/svg/W3C-SVG-1.1/resources/run-webkit-tests-epilogue.html [new file with mode: 0644]
LayoutTests/platform/win/svg/W3C-SVG-1.1/resources/run-webkit-tests-prologue.html [new file with mode: 0644]
LayoutTests/svg/text/text-tselect-02-f.svg

index d4263ac2901ddd6c168e959d06275ee4b8f08d56..737a323029be531ed7183eff0009eaccfd6d3a18 100644 (file)
@@ -1,3 +1,26 @@
+2008-02-01  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Dave Hyatt.
+
+        - address the remaining tests listed under <rdar://problem/5075790> Layout tests that depend on certain fonts don't match Mac results
+
+        * fast/text/cg-fallback-bolding.html: Changed to use Ahem instead of
+        Geneva.
+        * fast/text/international/bidi-fallback-font-weight.html: Made Mac-only.
+        * platform/mac/fast/text/cg-fallback-bolding-expected.checksum: Updated.
+        * platform/mac/fast/text/cg-fallback-bolding-expected.png: Updated
+        * platform/mac/fast/text/cg-fallback-bolding-expected.txt: Updated.
+        * platform/mac/fast/text/international/bidi-fallback-font-weight.html: Copied from LayoutTests/fast/text/international/bidi-fallback-font-weight.html.
+        * platform/win/Skipped: Removed passing tests and categorized remaining
+        failures.
+        * platform/win/svg/W3C-SVG-1.1: Added.
+        * platform/win/svg/W3C-SVG-1.1/resources: Added.
+        * platform/win/svg/W3C-SVG-1.1/resources/Mac-compatible-font-fallback.css: Added.
+        * platform/win/svg/W3C-SVG-1.1/resources/run-webkit-tests-epilogue.html: Added.
+        * platform/win/svg/W3C-SVG-1.1/resources/run-webkit-tests-prologue.html: Added.
+        * svg/text/text-tselect-02-f.svg: Added @font-face rule to use Lucida
+        Grande for Hebrew.
+
 2008-02-01  Dan Bernstein  <mitz@apple.com>
 
         Reviewed by Alexey Proskuryakov.
index 20af920febff6d275e8b3a7869c0fc9cce44d960..eb70f52b04c16481d9c50761ff8e08420a43ef19 100644 (file)
@@ -1,7 +1,7 @@
-<p>The single Hebrew glyph below should be in the Lucida Grande font.  It should not be a synthetic bold, because the first font in the list (Geneva)
+<p>The single Hebrew glyph below should be in the Lucida Grande font.  It should not be a synthetic bold, because the first font in the list (Ahem)
 does not have the glyph.  Therefore we fall back to the second font in the list (Lucida Grande), which does support bold.  This test is making sure
 we don't make incorrect assumptions based off the fact that we would have to synthesize bold for the first font in the list.
 
 </p>
-<p style="font-size:128px;font-weight:bold; font-family: Geneva, 'Lucida Grande'">
+<p style="font-size:128px;font-weight:bold; font-family: Ahem, 'Lucida Grande'">
 &#x05d0;</p>
\ No newline at end of file
index 79b7726b6e067343bbef2df903fd934d0523cca2..ed7e0ba16b2c08a002997ce035a7ffa758824b84 100644 (file)
@@ -1 +1 @@
-ffeea94c5fb08f6f9a4d317014d8ffad
\ No newline at end of file
+12e73e033396b9338496660f8fab19bb
\ No newline at end of file
index 01eb5629f635b440cd22c4b57e2e0397ba4f7f88..ed1fec53f81be2ed213dc0f962ac7dc43c6b25f8 100644 (file)
Binary files a/LayoutTests/platform/mac/fast/text/cg-fallback-bolding-expected.png and b/LayoutTests/platform/mac/fast/text/cg-fallback-bolding-expected.png differ
index 5e0c22afafa443fce837d0383bf33786fcfa40da..6948688f1f5e1e79d988e7496c36189ab85f526f 100644 (file)
@@ -7,11 +7,11 @@ layer at (0,0) size 800x600
         RenderText {#text} at (0,0) size 783x72
           text run at (0,0) width 444: "The single Hebrew glyph below should be in the Lucida Grande font. "
           text run at (444,0) width 339: "It should not be a synthetic bold, because the first font"
-          text run at (0,18) width 282: "in the list (Geneva) does not have the glyph. "
-          text run at (282,18) width 476: "Therefore we fall back to the second font in the list (Lucida Grande), which"
-          text run at (0,36) width 120: "does support bold. "
-          text run at (120,36) width 640: "This test is making sure we don't make incorrect assumptions based off the fact that we would have to"
+          text run at (0,18) width 272: "in the list (Ahem) does not have the glyph. "
+          text run at (272,18) width 509: "Therefore we fall back to the second font in the list (Lucida Grande), which does"
+          text run at (0,36) width 87: "support bold. "
+          text run at (87,36) width 640: "This test is making sure we don't make incorrect assumptions based off the fact that we would have to"
           text run at (0,54) width 264: "synthesize bold for the first font in the list."
-      RenderBlock {P} at (0,200) size 784x171
-        RenderText {#text} at (0,5) size 84x160
-          text run at (0,5) width 84 RTL: "\x{5D0}"
+      RenderBlock {P} at (0,200) size 784x128
+        RenderText {#text} at (0,0) size 84x128
+          text run at (0,0) width 84 RTL: "\x{5D0}"
index b5a2c5f62de1e5226052f8342b6f02f1b1faceb6..f8d730267ffbac1b8dfc5737c14697bc6939cc7e 100644 (file)
@@ -45,37 +45,39 @@ http/tests/security/cross-frame-access-protocol.html
 # Fails <rdar://problem/5674289>
 media/video-seek-past-end-paused.html
 
-# Layout tests that depend on certain fonts don't match Mac results <rdar://problem/5075790>
-css2.1/t1202-counter-09-b.html
-css2.1/t1202-counters-09-b.html
-fast/encoding/denormalised-voiced-japanese-chars.html
-fast/lists/w3-list-styles.html
-fast/text/international/002.html
+# <rdar://problem/5075790> Layout tests that depend on certain fonts don't match Mac results:
+#                          - Mac OS X and Windows do not have an Arabic font in common
+fast/text/international/bidi-AN-after-L.html
+fast/text/international/bidi-CS-after-AN.html
 fast/text/international/bidi-neutral-run.html
-fast/text/international/wrap-CJK-001.html
+fast/text/international/bidi-neutral-directionality-paragraph-start.html
 svg/W3C-SVG-1.1/fonts-glyph-02-t.svg
-svg/W3C-SVG-1.1/interact-cursor-01-f.svg
-svg/W3C-SVG-1.1/text-fonts-01-t.svg
 svg/W3C-SVG-1.1/text-intro-05-t.svg
-svg/W3C-SVG-1.1/text-tselect-02-f.svg
-svg/batik/text/smallFonts.svg
 svg/batik/text/textBiDi.svg
-svg/text/text-fonts-01-t.svg
 svg/text/text-intro-05-t.svg
-svg/text/text-tselect-02-f.svg
-
-# No advanced text <rdar://problems/4516194>
+#                           - Mac OS X and Windows do not have a CJK font in common
+fast/encoding/denormalised-voiced-japanese-chars.html
+fast/text/international/002.html
+fast/text/international/003.html
+fast/text/international/wrap-CJK-001.html
+svg/W3C-SVG-1.1/text-fonts-01-t.svg
+svg/text/text-fonts-01-t.svg
+#                           - Windows does not have Geneva
+svg/W3C-SVG-1.1/interact-cursor-01-f.svg
+#                           - Mac OS X and Windows do not have a Thai font in common
 fast/text/atsui-multiple-renderers.html
+fast/text/international/thai-line-breaks.html
+#                           - Mac OS X and Windows do not have a Georgian font in common
+css2.1/t1202-counter-09-b.html
+css2.1/t1202-counters-09-b.html
+fast/lists/w3-list-styles.html
+
+# <rdar://problem/5720592> Width of certain complex text using Times is off by one
 fast/text/atsui-pointtooffset-calls-cg.html
-fast/text/atsui-spacing-features.html
-fast/text/cg-fallback-bolding.html
 fast/text/cg-vs-atsui.html
-fast/text/international/003.html
-fast/text/international/bidi-AN-after-L.html
-fast/text/international/bidi-CS-after-AN.html
-fast/text/international/bidi-fallback-font-weight.html
-fast/text/international/bidi-neutral-directionality-paragraph-start.html
-fast/text/international/thai-line-breaks.html
+
+# <rdar://problem/5720637> Missing characters in complex text where different fonts are used in the same run
+fast/text/atsui-spacing-features.html
 
 # <rdar://problem/5718773> Support a minimum antialiased font size
 svg/hixie/text/003.html
@@ -290,6 +292,9 @@ fast/frames/frame-name-reset.html
 # <rdar://5313536> Intermittently fails
 fast/dom/frame-loading-via-document-write.html
 
+# <rdar://5646437> REGRESSION (r28015): svg/batik/text/smallFonts fails
+svg/batik/text/smallFonts.svg
+
 # <rdar://5686552> Intermittently fails
 svg/css/glyph-orientation-rounding-test.xhtml
 
@@ -309,6 +314,9 @@ http/tests/security/cross-frame-access-port.html
 # <rdar://problem/5713127>
 media/video-display-toggle.html
 
+# <rdar://problem/5720767>
+svg/W3C-SVG-1.1/text-tselect-02-f.svg
+
 ################################################################################
 ####################### No bugs filed about the below yet#######################
 ################################################################################
diff --git a/LayoutTests/platform/win/svg/W3C-SVG-1.1/resources/Mac-compatible-font-fallback.css b/LayoutTests/platform/win/svg/W3C-SVG-1.1/resources/Mac-compatible-font-fallback.css
new file mode 100644 (file)
index 0000000..ed7689f
--- /dev/null
@@ -0,0 +1,7 @@
+/* Hebrew */
+
+@font-face {
+    font-family: 'times';
+    src: local('Lucida Grande');
+    unicode-range: U+0590-05FF;
+}
diff --git a/LayoutTests/platform/win/svg/W3C-SVG-1.1/resources/run-webkit-tests-epilogue.html b/LayoutTests/platform/win/svg/W3C-SVG-1.1/resources/run-webkit-tests-epilogue.html
new file mode 100644 (file)
index 0000000..d344e32
--- /dev/null
@@ -0,0 +1,3 @@
+<script>
+layoutTestController.clearPersistentUserStyleSheet();
+</script>
diff --git a/LayoutTests/platform/win/svg/W3C-SVG-1.1/resources/run-webkit-tests-prologue.html b/LayoutTests/platform/win/svg/W3C-SVG-1.1/resources/run-webkit-tests-prologue.html
new file mode 100644 (file)
index 0000000..2c268d3
--- /dev/null
@@ -0,0 +1,3 @@
+<script>
+layoutTestController.setPersistentUserStyleSheetLocation(document.documentURI.replace(/[^/]*$/g, "") + "Mac-compatible-font-fallback.css");
+</script>
index 13d5252bb08836ec1b4ff5b1ee8d1dde1af8fba3..7b9a0dcd3f3d3c99b64f0795a42e6e3e6a4dce2e 100644 (file)
   </g>
   <text id="revision" x="10" y="340" font-size="40" stroke="none" fill="black">$Revision: 1.2 $</text>
   <rect id="test-frame" x="1" y="1" width="478" height="358" fill="none" stroke="#000"/>
+  <style>
+    /* Hebrew */
+
+    @font-face {
+        font-family: 'times';
+        src: local('Lucida Grande');
+        unicode-range: U+0590-05FF;
+    }
+  </style>
 <script>
 if (window.layoutTestController)
     window.layoutTestController.dumpSelectionRect();