Imported WebKit commit c4b613825abd39ac739a47d7b4410468fcef66dc (http://svn.webkit.org/repository/webkit/trunk@121147)

New snapshot that includes Win32 debug build fix (use SVGAllInOne)

1 files changed, 10 insertions, 0 deletions

diff --git a/Tools/DumpRenderTree/chromium/TestShellAndroid.cpp b/Tools/DumpRenderTree/chromium/TestShellAndroid.cpp
index ba182bbbb..f4cbf5e1f 100644
--- a/Tools/DumpRenderTree/chromium/TestShellAndroid.cpp
+++ b/Tools/DumpRenderTree/chromium/TestShellAndroid.cpp
@@ -32,6 +32,7 @@
 #include "TestShell.h"
 
 #include "linux/WebFontRendering.h"
+#include "third_party/skia/include/ports/SkTypeface_android.h"
 #include <android/log.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -43,6 +44,10 @@
 
 namespace {
 
+const char fontMainConfigFile[] = "/data/drt/android_main_fonts.xml";
+const char fontFallbackConfigFile[] = "/data/drt/android_fallback_fonts.xml";
+const char fontsDir[] = "/data/drt/fonts/";
+
 const char optionInFIFO[] = "--in-fifo=";
 const char optionOutFIFO[] = "--out-fifo=";
 const char optionErrFile[] = "--err-file=";
@@ -96,6 +101,11 @@ void redirectToFile(FILE* stream, const char* path, const char* mode)
 
 void platformInit(int* argc, char*** argv)
 {
+    // Initialize skia with customized font config files.
+    // FIXME: Add this call once SkUseTestFontConfigFile is added to Skia and
+    // visible to WebKit. See https://bugs.webkit.org/show_bug.cgi?id=89801
+    // SkUseTestFontConfigFile(fontMainConfigFile, fontFallbackConfigFile, fontsDir);
+
     const char* inFIFO = 0;
     const char* outFIFO = 0;
     const char* errFile = 0;