diff options
Diffstat (limited to 'webkit/tools/test_shell')
| -rw-r--r-- | webkit/tools/test_shell/test_shell_platform_delegate_win.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/webkit/tools/test_shell/test_shell_platform_delegate_win.cc b/webkit/tools/test_shell/test_shell_platform_delegate_win.cc index 4c2e1b8..13a6673 100644 --- a/webkit/tools/test_shell/test_shell_platform_delegate_win.cc +++ b/webkit/tools/test_shell/test_shell_platform_delegate_win.cc @@ -52,10 +52,11 @@ bool TestShellPlatformDelegate::CheckLayoutTestSystemDependencies() { // default to XP metrics, override if on Vista int requiredVScrollSize = 17; int requiredFontSize = -11; // 8 pt - const WCHAR *requiredFont = L"Tahoma"; + const wchar_t* requiredFont = L"Tahoma"; + // Consider Windows 7 as Vista. bool isVista = false; if (osvi.dwMajorVersion == 6 - && osvi.dwMinorVersion == 0 + && (osvi.dwMinorVersion == 0 || osvi.dwMinorVersion == 1) && osvi.wProductType == VER_NT_WORKSTATION) { requiredFont = L"Segoe UI"; requiredFontSize = -12; // 9 pt |