diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-27 17:17:15 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-27 17:17:15 +0000 |
| commit | a2b875ea13984642bbcb58cd47148f3995da9e53 (patch) | |
| tree | 80f2d54a235b0582c13832a3f8fdb1d60f630374 /webkit/tools/test_shell | |
| parent | 82d0646664cda7278163dffad687eb4e95e7e84d (diff) | |
| download | chromium_src-a2b875ea13984642bbcb58cd47148f3995da9e53.zip chromium_src-a2b875ea13984642bbcb58cd47148f3995da9e53.tar.gz chromium_src-a2b875ea13984642bbcb58cd47148f3995da9e53.tar.bz2 | |
Let layout tests run on Windows 7.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/337043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30211 0039d316-1c4b-4281-b951-d872f2087c98
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 |