Consolidate the many copies of Ahem in our tests
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 21 Nov 2011 17:55:07 +0000 (17:55 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 21 Nov 2011 17:55:07 +0000 (17:55 +0000)
https://bugs.webkit.org/show_bug.cgi?id=72503

Patch by Philip Rogers <pdr@google.com> on 2011-11-21
Reviewed by Andreas Kling.

* css3/flexbox/flex-align-vertical-writing-mode.html:
* css3/flexbox/flex-align.html:
* fast/css/custom-font-xheight.html:
* fast/css/font-face-download-error.html:
* fast/css/font-face-in-shadow-DOM.html-disabled:
* fast/css/font-face-multiple-faces.html:
* fast/css/font-face-multiple-families.html:
* fast/css/font-face-opentype.html:
* fast/css/font-face-remote.html:
* fast/css/font-face-repeated-url.html:
* fast/css/font-face-unicode-range.html:
* fast/css/font-face-unused-source-loaded.html:
* fast/css/font-face-woff.html:
* fast/css/font-face-zero-hash-key.html:
* fast/css/resources/Ahem.otf: Removed.
* fast/css/resources/Ahem.ttf: Removed.
* fast/css/resources/Ahem.woff: Removed.
* inspector/audits/resources/Ahem.ttf: Removed.
* inspector/extensions/extensions-network-expected.txt:
* inspector/extensions/extensions-network.html:
* inspector/extensions/resources/Ahem.ttf: Removed.
* platform/gtk/fonts/font-face-with-complex-text.html:
* platform/gtk/fonts/resources/Ahem.ttf: Removed.
* platform/gtk/fonts/synthetic-oblique-positioning.html:
* resources/Ahem.otf: Added.
* resources/Ahem.woff: Added.
* webarchive/resources/Ahem.ttf: Removed.
* webarchive/test-css-url-resources-in-stylesheets-expected.webarchive:
* webarchive/test-css-url-resources-in-stylesheets.html:
* webarchive/test-css-url-resources-inline-styles-expected.webarchive:
* webarchive/test-css-url-resources-inline-styles.html:

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

30 files changed:
LayoutTests/ChangeLog
LayoutTests/css3/flexbox/flex-align-vertical-writing-mode.html
LayoutTests/css3/flexbox/flex-align.html
LayoutTests/fast/css/custom-font-xheight.html
LayoutTests/fast/css/font-face-download-error.html
LayoutTests/fast/css/font-face-in-shadow-DOM.html-disabled
LayoutTests/fast/css/font-face-multiple-faces.html
LayoutTests/fast/css/font-face-multiple-families.html
LayoutTests/fast/css/font-face-opentype.html
LayoutTests/fast/css/font-face-remote.html
LayoutTests/fast/css/font-face-repeated-url.html
LayoutTests/fast/css/font-face-unicode-range.html
LayoutTests/fast/css/font-face-unused-source-loaded.html
LayoutTests/fast/css/font-face-woff.html
LayoutTests/fast/css/font-face-zero-hash-key.html
LayoutTests/fast/css/resources/Ahem.ttf [deleted file]
LayoutTests/inspector/audits/resources/Ahem.ttf [deleted file]
LayoutTests/inspector/extensions/extensions-network-expected.txt
LayoutTests/inspector/extensions/extensions-network.html
LayoutTests/inspector/extensions/resources/Ahem.ttf [deleted file]
LayoutTests/platform/gtk/fonts/font-face-with-complex-text.html
LayoutTests/platform/gtk/fonts/resources/Ahem.ttf [deleted file]
LayoutTests/platform/gtk/fonts/synthetic-oblique-positioning.html
LayoutTests/resources/Ahem.otf [moved from LayoutTests/fast/css/resources/Ahem.otf with 100% similarity]
LayoutTests/resources/Ahem.woff [moved from LayoutTests/fast/css/resources/Ahem.woff with 100% similarity]
LayoutTests/webarchive/resources/Ahem.ttf [deleted file]
LayoutTests/webarchive/test-css-url-resources-in-stylesheets-expected.webarchive
LayoutTests/webarchive/test-css-url-resources-in-stylesheets.html
LayoutTests/webarchive/test-css-url-resources-inline-styles-expected.webarchive
LayoutTests/webarchive/test-css-url-resources-inline-styles.html

index 7c17df8..7c9eede 100644 (file)
@@ -1,3 +1,42 @@
+2011-11-21  Philip Rogers  <pdr@google.com>
+
+        Consolidate the many copies of Ahem in our tests
+        https://bugs.webkit.org/show_bug.cgi?id=72503
+
+        Reviewed by Andreas Kling.
+
+        * css3/flexbox/flex-align-vertical-writing-mode.html:
+        * css3/flexbox/flex-align.html:
+        * fast/css/custom-font-xheight.html:
+        * fast/css/font-face-download-error.html:
+        * fast/css/font-face-in-shadow-DOM.html-disabled:
+        * fast/css/font-face-multiple-faces.html:
+        * fast/css/font-face-multiple-families.html:
+        * fast/css/font-face-opentype.html:
+        * fast/css/font-face-remote.html:
+        * fast/css/font-face-repeated-url.html:
+        * fast/css/font-face-unicode-range.html:
+        * fast/css/font-face-unused-source-loaded.html:
+        * fast/css/font-face-woff.html:
+        * fast/css/font-face-zero-hash-key.html:
+        * fast/css/resources/Ahem.otf: Removed.
+        * fast/css/resources/Ahem.ttf: Removed.
+        * fast/css/resources/Ahem.woff: Removed.
+        * inspector/audits/resources/Ahem.ttf: Removed.
+        * inspector/extensions/extensions-network-expected.txt:
+        * inspector/extensions/extensions-network.html:
+        * inspector/extensions/resources/Ahem.ttf: Removed.
+        * platform/gtk/fonts/font-face-with-complex-text.html:
+        * platform/gtk/fonts/resources/Ahem.ttf: Removed.
+        * platform/gtk/fonts/synthetic-oblique-positioning.html:
+        * resources/Ahem.otf: Added.
+        * resources/Ahem.woff: Added.
+        * webarchive/resources/Ahem.ttf: Removed.
+        * webarchive/test-css-url-resources-in-stylesheets-expected.webarchive:
+        * webarchive/test-css-url-resources-in-stylesheets.html:
+        * webarchive/test-css-url-resources-inline-styles-expected.webarchive:
+        * webarchive/test-css-url-resources-inline-styles.html:
+
 2011-11-21  Pavel Feldman  <pfeldman@google.com>
 
         Not reviewed: unskip inspector test on chromium.
index 2c61d67..6a00e6c 100644 (file)
@@ -38,7 +38,7 @@ body {
 }
 @font-face {
     font-family: test;
-    src: url(../../fast/css/resources/Ahem.ttf);
+    src: url(../../resources/Ahem.ttf);
 }
 </style>
 <script>
index d6f07ac..8c6f823 100644 (file)
@@ -37,7 +37,7 @@ body {
 }
 @font-face {
     font-family: test;
-    src: url(../../fast/css/resources/Ahem.ttf);
+    src: url(../../resources/Ahem.ttf);
 }
 </style>
 <script>
index 0552c90..b108eb5 100644 (file)
@@ -3,7 +3,7 @@
 <style>
 @font-face {
  font-family: "test-xheight";
- src: url(resources/Ahem.otf);
+ src: url(../../resources/Ahem.otf);
  font-style: normal;
  font-weight: 700;
 }
index f1ba1bd..f0e8586 100644 (file)
@@ -15,7 +15,7 @@
 }
 @font-face {
     font-family:myfont_0;
-    src: url('resources/Ahem.otf');
+    src: url('../../resources/Ahem.otf');
     unicode-range: u+69; /* 'i' */
 }
 
@@ -37,7 +37,7 @@
 }
 @font-face {
     font-family:myfont_2;
-    src: url('resources/DownLoadErrorAhem.otf'), url('resources/Ahem.otf');
+    src: url('resources/DownLoadErrorAhem.otf'), url('../../resources/Ahem.otf');
     unicode-range: u+69; /* 'i' */
 }
 
index 08fb10c..9add106 100644 (file)
@@ -3,7 +3,7 @@
     p > p { }
     @font-face {
         font-family: 'remote';
-        src: url(resources/Ahem.ttf);
+        src: url(../../resources/Ahem.ttf);
     }
 </style>
 <textarea style="width: 108px; height: 102px; font-family: remote; font-size: 100px; color: green; background-color: red; padding: 0;">A</textarea>
index c202386..f072a14 100644 (file)
     @font-face {
         font-family: webkit-two;
         font-style: italic;
-        src: url(resources/Ahem.ttf);
+        src: url(../../resources/Ahem.ttf);
     }
 
     @font-face {
         font-family: webkit-three;
-        src: url(resources/Ahem.ttf);
+        src: url(../../resources/Ahem.ttf);
     }
 
     @font-face {
         font-family: webkit-four;
         font-style: normal;
-        src: url(resources/Ahem.ttf);
+        src: url(../../resources/Ahem.ttf);
     }
 
     @font-face {
         font-family: webkit-five;
         font-weight: 100;
-        src: url(resources/Ahem.ttf);
+        src: url(../../resources/Ahem.ttf);
     }
 
     @font-face {
index 65ce7d4..57bb769 100644 (file)
@@ -1,7 +1,7 @@
 <style>
     @font-face {
         font-family: family1, family2;
-        src: url(resources/Ahem.ttf);
+        src: url(../../resources/Ahem.ttf);
     }
 </style>
 <p>
index 51a3827..df2ac06 100644 (file)
@@ -1,7 +1,7 @@
 <style>
     @font-face {
         font-family: family1;
-        src: url(resources/Ahem.otf);
+        src: url(../../resources/Ahem.otf);
     }
 </style>
 <p>
index b0d891b..31a5aec 100644 (file)
@@ -2,7 +2,7 @@
     <style>
         @font-face {
             font-family: 'remote';
-            src: url(resources/Ahem.ttf);
+            src: url(../../resources/Ahem.ttf);
         }
     
         div { width: 100px; height: 100px; background-color: red; font-family: 'remote'; font-size: 20px; color: green; }
index b957b1e..9f9580b 100644 (file)
@@ -20,7 +20,7 @@ function test()
 <style>
     @font-face {
         font-family: myfont;
-        src: url(resources/Ahem.ttf), url(resources/Ahem.ttf#foo) format('svg');
+        src: url(../../resources/Ahem.ttf), url(../../resources/Ahem.ttf#foo) format('svg');
     }
 </style>
 <body onload="setTimeout(test, 300)"> 
index 3a65721..4a399e4 100644 (file)
@@ -10,7 +10,7 @@
         }
         @font-face {
             font-family: 'test1';
-            src: url('resources/Ahem.ttf');
+            src: url('../../resources/Ahem.ttf');
             unicode-range: U+0041;
         }
 
@@ -20,7 +20,7 @@
         }
         @font-face {
             font-family: 'test2';
-            src: url('resources/Ahem.ttf');
+            src: url('../../resources/Ahem.ttf');
             unicode-range: U+004?;
         }
 
@@ -30,7 +30,7 @@
         }
         @font-face {
             font-family: 'test3';
-            src: url('resources/Ahem.ttf');
+            src: url('../../resources/Ahem.ttf');
             unicode-range: U+0042-0044;
         }
 
@@ -40,7 +40,7 @@
         }
         @font-face {
             font-family: 'test4';
-            src: url('resources/Ahem.ttf');
+            src: url('../../resources/Ahem.ttf');
             unicode-range: U+0050-0058;
         }
         @font-face {
@@ -55,7 +55,7 @@
         }
         @font-face {
             font-family: 'test5';
-            src: url('resources/Ahem.ttf');
+            src: url('../../resources/Ahem.ttf');
             unicode-range: U+0050-0058;
         }
         @font-face {
index 04048c2..46ce458 100644 (file)
@@ -1,12 +1,12 @@
 <style>
     @font-face {
         font-family: url-only;
-        src: url(resources/Ahem.ttf);
+        src: url(../../resources/Ahem.ttf);
     }
 
     @font-face {
         font-family: local-and-url;
-        src: local(Arial), url(resources/Ahem.ttf);
+        src: local(Arial), url(../../resources/Ahem.ttf);
     }
 </style>
 <body onload="document.body.offsetTop">
index e0be808..bee473e 100644 (file)
@@ -1,7 +1,7 @@
 <style>
     @font-face {
         font-family: family1;
-        src: url(resources/Ahem.woff) format("woff");
+        src: url(../../resources/Ahem.woff) format("woff");
     }
 </style>
 
index 5a16a5c..9f58a66 100644 (file)
@@ -5,7 +5,7 @@
 <style>
     @font-face {
         font-family: test;
-        src: url(resources/Ahem.ttf);
+        src: url(../../resources/Ahem.ttf);
     }
 </style>
 <p>
diff --git a/LayoutTests/fast/css/resources/Ahem.ttf b/LayoutTests/fast/css/resources/Ahem.ttf
deleted file mode 100644 (file)
index ac81cb0..0000000
Binary files a/LayoutTests/fast/css/resources/Ahem.ttf and /dev/null differ
diff --git a/LayoutTests/inspector/audits/resources/Ahem.ttf b/LayoutTests/inspector/audits/resources/Ahem.ttf
deleted file mode 100755 (executable)
index ac81cb0..0000000
Binary files a/LayoutTests/inspector/audits/resources/Ahem.ttf and /dev/null differ
index eb9f8aa..1036a2c 100644 (file)
@@ -11,9 +11,9 @@ resource: .../tests/inspector/inspector-test.js
 resource: .../inspector/extensions/extensions-network.html
 resource: .../inspector/extensions/extensions-network.html
 resource: .../extensions/resources/abe.png
-resource: .../extensions/resources/Ahem.ttf
 resource: .../extensions/resources/audits-style1.css
 resource: .../extensions/resources/missing-image.png
+resource: .../LayoutTests/resources/Ahem.ttf
 RUNNING TEST: extension_testGetRequestContent
 {
     0 : ".some-style {
index ef0c250..7a78707 100644 (file)
@@ -4,7 +4,7 @@
 <style>
 @font-face {
     font-family: 'test';
-    src: url(resources/Ahem.ttf);
+    src: url(../../resources/Ahem.ttf);
 }
 
 p { font-family: 'test'; }
diff --git a/LayoutTests/inspector/extensions/resources/Ahem.ttf b/LayoutTests/inspector/extensions/resources/Ahem.ttf
deleted file mode 100644 (file)
index ac81cb0..0000000
Binary files a/LayoutTests/inspector/extensions/resources/Ahem.ttf and /dev/null differ
index a9f76b2..8623e1a 100644 (file)
@@ -4,7 +4,7 @@
     @font-face {
         font-family: webkit-ahem;
         font-style: normal;
-        src: url(resources/Ahem.ttf) format(truetype);
+        src: url(../../../resources/Ahem.ttf) format(truetype);
     }
     body { text-rendering: geometricPrecision; }
 </style>
diff --git a/LayoutTests/platform/gtk/fonts/resources/Ahem.ttf b/LayoutTests/platform/gtk/fonts/resources/Ahem.ttf
deleted file mode 100644 (file)
index ac81cb0..0000000
Binary files a/LayoutTests/platform/gtk/fonts/resources/Ahem.ttf and /dev/null differ
index d92ffde..e5001ca 100644 (file)
@@ -4,7 +4,7 @@
     @font-face {
         font-family: webkit-ahem;
         font-style: normal;
-        src: url(resources/Ahem.ttf) format(truetype);
+        src: url(../../../resources/Ahem.ttf) format(truetype);
     }
 </style>
 </head>
diff --git a/LayoutTests/webarchive/resources/Ahem.ttf b/LayoutTests/webarchive/resources/Ahem.ttf
deleted file mode 100644 (file)
index ac81cb0..0000000
Binary files a/LayoutTests/webarchive/resources/Ahem.ttf and /dev/null differ
index 557c3f3..759a9d0 100644 (file)
@@ -26,7 +26,7 @@ function notifyDone()
 @font-face {
     font-family: webkit-ahem;
     font-style: normal;
-    src: url(firstInvalidURL), url(secondInvalidURL), url(resources/Ahem.ttf);
+    src: url(firstInvalidURL), url(secondInvalidURL), url(../resources/Ahem.ttf);
 }
 
 div.background {
@@ -502,12 +502,12 @@ div.webkit-mask-image-list {
                                <key>MIMEType</key>
                                <string>application/octet-stream</string>
                                <key>URL</key>
-                               <string>file:///LayoutTests/webarchive/resources/Ahem.ttf</string>
+                               <string>file:///LayoutTests/resources/Ahem.ttf</string>
                                <key>expectedContentLength</key>
                                <integer>12480</integer>
                        </dict>
                        <key>WebResourceURL</key>
-                       <string>file:///LayoutTests/webarchive/resources/Ahem.ttf</string>
+                       <string>file:///LayoutTests/resources/Ahem.ttf</string>
                </dict>
                <dict>
                        <key>WebResourceData</key>
index ba009da..2dae80c 100644 (file)
@@ -20,7 +20,7 @@ function notifyDone()
 @font-face {
     font-family: webkit-ahem;
     font-style: normal;
-    src: url(firstInvalidURL), url(secondInvalidURL), url(resources/Ahem.ttf);
+    src: url(firstInvalidURL), url(secondInvalidURL), url(../resources/Ahem.ttf);
 }
 
 div.background {
index 4f386bd..2c6f6cd 100644 (file)
@@ -25,7 +25,7 @@ function notifyDone()
 @font-face {
     font-family: webkit-ahem;
     font-style: normal;
-    src: url(firstInvalidURL), url(secondInvalidURL), url(resources/Ahem.ttf);
+    src: url(firstInvalidURL), url(secondInvalidURL), url(../resources/Ahem.ttf);
 }
 &lt;/style&gt;
 &lt;/head&gt;
@@ -396,12 +396,12 @@ function notifyDone()
                                <key>MIMEType</key>
                                <string>application/octet-stream</string>
                                <key>URL</key>
-                               <string>file:///LayoutTests/webarchive/resources/Ahem.ttf</string>
+                               <string>file:///LayoutTests/resources/Ahem.ttf</string>
                                <key>expectedContentLength</key>
                                <integer>12480</integer>
                        </dict>
                        <key>WebResourceURL</key>
-                       <string>file:///LayoutTests/webarchive/resources/Ahem.ttf</string>
+                       <string>file:///LayoutTests/resources/Ahem.ttf</string>
                </dict>
                <dict>
                        <key>WebResourceData</key>
index 081cdaf..4a0e2e0 100644 (file)
@@ -19,7 +19,7 @@ function notifyDone()
 @font-face {
     font-family: webkit-ahem;
     font-style: normal;
-    src: url(firstInvalidURL), url(secondInvalidURL), url(resources/Ahem.ttf);
+    src: url(firstInvalidURL), url(secondInvalidURL), url(../resources/Ahem.ttf);
 }
 </style>
 </head>