Add kochi and dejavu fonts to default package list on linux

webkit/tools/test_shell/test_shell_gtk.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/tools/test_shell/test_shell.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <fontconfig/fontconfig.h>
 #include <gtk/gtk.h>
@@ skipping 193 matching lines @@
                               true)) {
       LOG(FATAL) << "Failed to parse fontconfig config file";
     }
     // We can delete the temp file after font config has parsed it.
     file_util::Delete(fontconfig_path, false);
 
     // This is the list of fonts that fontconfig will know about. It
     // will try its best to match based only on the fonts here in. The
     // paths are where these fonts are found on our Ubuntu boxes.
     static const char *const fonts[] = {
+      "/usr/share/fonts/truetype/kochi/kochi-gothic.ttf",
+      "/usr/share/fonts/truetype/kochi/kochi-mincho.ttf",
       "/usr/share/fonts/truetype/msttcorefonts/Arial.ttf",
       "/usr/share/fonts/truetype/msttcorefonts/Arial_Bold.ttf",
       "/usr/share/fonts/truetype/msttcorefonts/Arial_Bold_Italic.ttf",
       "/usr/share/fonts/truetype/msttcorefonts/Arial_Italic.ttf",
       "/usr/share/fonts/truetype/msttcorefonts/Comic_Sans_MS.ttf",
       "/usr/share/fonts/truetype/msttcorefonts/Comic_Sans_MS_Bold.ttf",
       "/usr/share/fonts/truetype/msttcorefonts/Courier_New.ttf",
       "/usr/share/fonts/truetype/msttcorefonts/Courier_New_Bold.ttf",
       "/usr/share/fonts/truetype/msttcorefonts/Courier_New_Bold_Italic.ttf",
       "/usr/share/fonts/truetype/msttcorefonts/Courier_New_Italic.ttf",
       "/usr/share/fonts/truetype/msttcorefonts/Georgia.ttf",
       "/usr/share/fonts/truetype/msttcorefonts/Georgia_Bold.ttf",
       "/usr/share/fonts/truetype/msttcorefonts/Georgia_Bold_Italic.ttf",
       "/usr/share/fonts/truetype/msttcorefonts/Georgia_Italic.ttf",
       "/usr/share/fonts/truetype/msttcorefonts/Impact.ttf",
       "/usr/share/fonts/truetype/msttcorefonts/Trebuchet_MS.ttf",
       "/usr/share/fonts/truetype/msttcorefonts/Trebuchet_MS_Bold.ttf",
       "/usr/share/fonts/truetype/msttcorefonts/Trebuchet_MS_Bold_Italic.ttf",
       "/usr/share/fonts/truetype/msttcorefonts/Trebuchet_MS_Italic.ttf",
       "/usr/share/fonts/truetype/msttcorefonts/Times_New_Roman.ttf",
       "/usr/share/fonts/truetype/msttcorefonts/Times_New_Roman_Bold.ttf",
       "/usr/share/fonts/truetype/msttcorefonts/Times_New_Roman_Bold_Italic.ttf",
       "/usr/share/fonts/truetype/msttcorefonts/Times_New_Roman_Italic.ttf",
       "/usr/share/fonts/truetype/msttcorefonts/Verdana.ttf",
       "/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",
+      // The DejaVuSans font is used by the LayoutTests/css2.1 tests
+      "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf",
       "/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_ta.ttf",
       "/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_pa.ttf",
       "/usr/share/fonts/truetype/ttf-indic-fonts-core/MuktiNarrow.ttf",
     };
     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 "
                    << "http://code.google.com/p/chromium/wiki/"
                    << "LinuxBuildInstructions";
       }
       if (!FcConfigAppFontAddFile(fontcfg, (FcChar8 *) fonts[i]))
         LOG(FATAL) << "Failed to load font " << fonts[i];
     }
 
     // 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",
-      "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.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.";
+                     << "To get LucidaSansRegular, install sun-java6-fonts.  "
+                     << "This will also install a JRE";

[Evan Martin, 2010/03/25 23:26:12]

Ok, this JRE comment is a bit weird.  (Why mention it?  Is it required by the
build?  Etc.  Even an emoticon would make it clearer I think)

       } else {
         if (!FcConfigAppFontAddFile(fontcfg, (FcChar8 *) font))
           LOG(FATAL) << "Failed to load font " << font;
       }
     }
 
     // Also load the layout-test-specific "Ahem" font.
     base::StringPiece ahem_font;
     g_resource_data_pack->GetStringPiece(IDR_AHEM_FONT, &ahem_font);
     g_ahem_path = new FilePath;
@@ skipping 398 matching lines @@
       break;
   }
   return TestShell::NetResourceProvider(resource_id);
 }
 
 void GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins) {
   NPAPI::PluginList::Singleton()->GetPlugins(refresh, plugins);
 }
 
 }  // namespace webkit_glue