Imported WebKit commit 3a8c29f35d00659d2ce7a0ccdfa8304f14e82327 (http://svn.webkit.org/repository/webkit/trunk@120813)

New snapshot with Windows build fixes

1 files changed, 5 insertions, 0 deletions

diff --git a/Tools/DumpRenderTree/chromium/TestShellAndroid.cpp b/Tools/DumpRenderTree/chromium/TestShellAndroid.cpp
index e77d80d48..ba182bbbb 100644
--- a/Tools/DumpRenderTree/chromium/TestShellAndroid.cpp
+++ b/Tools/DumpRenderTree/chromium/TestShellAndroid.cpp
@@ -31,6 +31,7 @@
 #include "config.h"
 #include "TestShell.h"
 
+#include "linux/WebFontRendering.h"
 #include <android/log.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -127,4 +128,8 @@ void platformInit(int* argc, char*** argv)
         // Redirect stderr to stdout.
         dup2(1, 2);
     }
+
+    // Disable auto hint and use normal hinting in layout test mode to produce the same font metrics as chromium-linux.
+    WebKit::WebFontRendering::setAutoHint(false);
+    WebKit::WebFontRendering::setHinting(SkPaint::kNormal_Hinting);
 }