From d4cfe8bf792310f6115d50092c5e638dd0af79d3 Mon Sep 17 00:00:00 2001 From: "abarth@webkit.org" Date: Wed, 27 Jun 2012 21:14:11 +0000 Subject: [PATCH] [Chromium] DumpRenderTree on Android should call SkUseTestFontConfigFile once available https://bugs.webkit.org/show_bug.cgi?id=89801 Reviewed by Nate Chapin. Let's call SkUseTestFontConfigFile now that it exists. * DumpRenderTree/chromium/TestShellAndroid.cpp: (platformInit): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121369 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Tools/ChangeLog | 12 ++++++++++++ Tools/DumpRenderTree/chromium/TestShellAndroid.cpp | 4 +--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Tools/ChangeLog b/Tools/ChangeLog index 676382b..87ec67a 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,15 @@ +2012-06-27 Adam Barth + + [Chromium] DumpRenderTree on Android should call SkUseTestFontConfigFile once available + https://bugs.webkit.org/show_bug.cgi?id=89801 + + Reviewed by Nate Chapin. + + Let's call SkUseTestFontConfigFile now that it exists. + + * DumpRenderTree/chromium/TestShellAndroid.cpp: + (platformInit): + 2012-06-27 Dirk Pranke Fix typo introduced in r121363. diff --git a/Tools/DumpRenderTree/chromium/TestShellAndroid.cpp b/Tools/DumpRenderTree/chromium/TestShellAndroid.cpp index f4cbf5e..bc0acaa 100644 --- a/Tools/DumpRenderTree/chromium/TestShellAndroid.cpp +++ b/Tools/DumpRenderTree/chromium/TestShellAndroid.cpp @@ -102,9 +102,7 @@ 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); + SkUseTestFontConfigFile(fontMainConfigFile, fontFallbackConfigFile, fontsDir); const char* inFIFO = 0; const char* outFIFO = 0; -- 2.7.4