Depend on a Japanese font to pass a few more layout tests.

Review URL: http://codereview.chromium.org/17282


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7761 0039d316-1c4b-4281-b951-d872f2087c98

10 files changed, 22 insertions, 22 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/001-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/001-expected.checksum
new file mode 100644
index 0000000..000965b
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/001-expected.checksum
@@ -0,0 +1 @@
+eea13bc4a7300e2c0221ad63841b2ef1
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/001-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/001-expected.png
new file mode 100644
index 0000000..52898cb
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/001-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/002-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/002-expected.checksum
new file mode 100644
index 0000000..2b67116
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/002-expected.checksum
@@ -0,0 +1 @@
+076cd443d91896108761d43a4798268a
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/002-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/002-expected.png
new file mode 100644
index 0000000..ed4851f
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/002-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/003-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/003-expected.checksum
new file mode 100644
index 0000000..122e706
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/003-expected.checksum
@@ -0,0 +1 @@
+d53f2309f55d7cd723c6b5aae128808e
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/003-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/003-expected.png
new file mode 100644
index 0000000..e02220c
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/003-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/wrap-CJK-001-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/wrap-CJK-001-expected.checksum
new file mode 100644
index 0000000..0a083de1
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/wrap-CJK-001-expected.checksum
@@ -0,0 +1 @@
+7419c1f357be63c526a8eae3601326a1
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/wrap-CJK-001-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/wrap-CJK-001-expected.png
new file mode 100644
index 0000000..6356450
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/wrap-CJK-001-expected.png
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 2bb619a..ecf2288 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1109,12 +1109,6 @@ LINUX : LayoutTests/fast/text/cg-vs-atsui.html = FAIL
 LINUX : LayoutTests/fast/text/international/complex-character-based-fallback.html = FAIL
 LINUX : LayoutTests/fast/text/large-text-composed-char.html = FAIL
 
-// Missing CJK fonts.
-LINUX : LayoutTests/fast/text/international/001.html = FAIL
-LINUX : LayoutTests/fast/text/international/002.html = FAIL
-LINUX : LayoutTests/fast/text/international/003.html = FAIL
-LINUX : LayoutTests/fast/text/international/wrap-CJK-001.html = FAIL
-
 // Missing text -- slow font path unimplemented?
 LINUX : LayoutTests/fast/text/international/bidi-AN-after-empty-run.html = FAIL
 LINUX : LayoutTests/fast/text/international/bidi-control-chars-treated-as-ZWS.html = FAIL
@@ -1757,7 +1751,6 @@ WIN : LayoutTests/fast/lists/w3-list-styles.html = FAIL
 WIN : LayoutTests/fast/text/international/001.html = FAIL
 WIN : LayoutTests/fast/text/international/002.html = FAIL
 WIN : LayoutTests/fast/text/international/003.html = FAIL
-WIN : LayoutTests/fast/text/international/wrap-CJK-001.html = FAIL
 
 // 2008/12/13 - Turning off some Friday night test regressions until
 // they can be looked at.
@@ -1868,4 +1861,3 @@ LayoutTests/svg/custom/pointer-events-text.svg = FAIL
 // Merge 39606:39660 - new tests
 SKIP : LayoutTests/fast/events/pointer-events-2.html = FAIL
 SKIP : LayoutTests/fast/events/pointer-events.html = FAIL
-
diff --git a/webkit/tools/test_shell/test_shell_gtk.cc b/webkit/tools/test_shell/test_shell_gtk.cc
index 211a07bd..72f2f82 100644
--- a/webkit/tools/test_shell/test_shell_gtk.cc
+++ b/webkit/tools/test_shell/test_shell_gtk.cc
@@ -98,9 +98,8 @@ void TestShell::InitializeTestShell(bool layout_test_mode) {
     "/usr/share/fonts/truetype/msttcorefonts/Verdana_Bold.ttf",
     "/usr/share/fonts/truetype/msttcorefonts/Verdana_Bold_Italic.ttf",
     "/usr/share/fonts/truetype/msttcorefonts/Verdana_Italic.ttf",
-    NULL
   };
-  for (size_t i = 0; fonts[i]; ++i) {
+  for (size_t i = 0; i < arraysize(fonts); ++i) {
     if (access(fonts[i], R_OK)) {
       LOG(FATAL) << "You are missing " << fonts[i] << ". "
                  << "Try installing msttcorefonts. Also see "
@@ -111,18 +110,23 @@ void TestShell::InitializeTestShell(bool layout_test_mode) {
       LOG(FATAL) << "Failed to load font " << fonts[i];
   }
 
-  // We special case this font because it's only needed in a few layout tests
-  // and it's in an obscure package (sun-java6-fonts), which pulls in the JDK.
-  const char* const lucida_sans_file =
-      "/usr/share/fonts/truetype/ttf-lucida/LucidaSansRegular.ttf";
-  if (access(lucida_sans_file, R_OK)) {
-    LOG(WARNING) << "You are missing " << lucida_sans_file
-                 << ". Without this, some layout tests will fail."
-                 << "It's not a major problem. You can get it from the "
-                 << "sun-java6-fonts package on Ubuntu.";
-  } else {
-    if (!FcConfigAppFontAddFile(fontcfg, (FcChar8 *) lucida_sans_file))
-      LOG(FATAL) << "Failed to load font " << lucida_sans_file;
+  // We special case these fonts because they're only needed in a few layout tests.
+  static const char* const optional_fonts[] = {
+    "/usr/share/fonts/truetype/ttf-lucida/LucidaSansRegular.ttf",
+    "/usr/share/fonts/truetype/kochi/kochi-gothic.ttf",
+    "/usr/share/fonts/truetype/kochi/kochi-mincho.ttf",
+  };
+  for (size_t i = 0; i < arraysize(optional_fonts); ++i) {
+    const char* font = optional_fonts[i];
+    if (access(font, R_OK) < 0) {
+      LOG(WARNING) << "You are missing " << font << ". "
+                   << "Without this, some layout tests will fail."
+                   << "It's not a major problem.  See the build instructions "
+                   << "for more information on where to get all the data.";
+    } else {
+      if (!FcConfigAppFontAddFile(fontcfg, (FcChar8 *) font))
+        LOG(FATAL) << "Failed to load font " << font;
+    }
   }
 
   // Also load the layout-test-specific "Ahem" font.