Enable layout testing support for font fallback

content/shell/app/webkit_test_platform_support_linux.cc

 // Copyright 2013 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 "content/shell/app/webkit_test_platform_support.h"
 
 #include <fontconfig/fontconfig.h>
 #include <unistd.h>
 
 #include <iostream>
@@ skipping 20 matching lines @@
     }
   }
   if (!FcConfigAppFontAddFile(
           fontcfg, reinterpret_cast<const FcChar8*>(font))) {
     std::cerr << "Failed to load font " << font << "\n";
     return false;
   }
   return true;
 }
 
+static bool LoadFontResources(const base::FilePath& base_path,
+                              FcConfig* font_config) {
+  const char* const own_fonts[] = {"AHEM____.TTF", "GardinerModBug.ttf",
+                                   "GardinerModCat.ttf"};
+
+  for (size_t i = 0; i < arraysize(own_fonts); ++i) {
+    base::FilePath font_path = base_path.Append(own_fonts[i]);
+    if (access(font_path.value().c_str(), R_OK) < 0 ||
+        !FcConfigAppFontAddFile(
+            font_config,
+            reinterpret_cast<const FcChar8*>(font_path.value().c_str()))) {
+      std::cerr << "Failed to load test font resource "

[jamesr, 2014/06/26 20:32:29]

why doesn't this use base's loggig facilities? i suspect the other use of cerr
dates back from when this code live in a TestRunner limbo between the blink and
chromium repositories and couldn't use WTF or base/, but that hasn't been the
situation for a while now

+                << font_path.value().c_str() << ".\n";
+      return false;
+    }
+  }
+  return true;
+}
+
 const char* const kFonts[] = {
     "/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",
@@ skipping 61 matching lines @@
     return false;
   }
 
   // We special case these fonts because they're only needed in a few layout
   // tests.
   CheckAndLoadFontFile(
       font_config,
       "/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_pa.ttf",
       "/usr/share/fonts/truetype/ttf-punjabi-fonts/lohit_pa.ttf");
 
-  base::FilePath ahem_font = base_path.Append("AHEM____.TTF");
-  if (!FcConfigAppFontAddFile(
-          font_config,
-          reinterpret_cast<const FcChar8*>(ahem_font.value().c_str()))) {
-    std::cerr << "Failed to load font " << ahem_font.value() << "\n";
+  if (!LoadFontResources(base_path, font_config))
     return false;
-  }
 
   if (!FcConfigSetCurrent(font_config)) {
     std::cerr << "Failed to set the default font configuration\n";
     return false;
   }
 
   return true;
 }
 
 }  // namespace
 
 bool CheckLayoutSystemDeps() {
   return true;
 }
 
 bool WebKitTestPlatformInitialize() {
   return SetupFontConfig();
 }
 
 }  // namespace content